summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sergey Nikolaienkov <sergeynv@google.com> 2020-11-11 10:04:28 +0000
committer Sergey Nikolaienkov <sergeynv@google.com> 2020-11-11 10:04:54 +0000
commite87b9f752e20d3633b2337b2204cc71e5fadb80b (patch)
treeaa8ffbece3f725556fb60a769ad64a66099da374
parent48f2b5af37e1bfb7d8a0dfba8517d094f255b648 (diff)
Fix crash when inflating tv_pip_controls
Remove SystemUI resources that are now in WmShell. Bug: 172989649 Test: atest WMShellFlickerTests Change-Id: I1276c1267d09fb1fdd646f7e0bba30f2b1a16f2b
-rw-r--r--packages/SystemUI/res/layout/tv_pip_control_button.xml53
-rw-r--r--packages/SystemUI/res/layout/tv_pip_controls.xml46
2 files changed, 0 insertions, 99 deletions
diff --git a/packages/SystemUI/res/layout/tv_pip_control_button.xml b/packages/SystemUI/res/layout/tv_pip_control_button.xml
deleted file mode 100644
index b9b0154e70b7..000000000000
--- a/packages/SystemUI/res/layout/tv_pip_control_button.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Layout for {@link com.android.systemui.pip.tv.PipControlButtonView}. -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
- <ImageView android:id="@+id/button"
- android:layout_width="34dp"
- android:layout_height="34dp"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:focusable="true"
- android:src="@drawable/tv_pip_button_focused"
- android:importantForAccessibility="yes" />
-
- <ImageView android:id="@+id/icon"
- android:layout_width="34dp"
- android:layout_height="34dp"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:padding="5dp"
- android:importantForAccessibility="no" />
-
- <TextView android:id="@+id/desc"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- android:layout_below="@id/icon"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:gravity="center"
- android:text="@string/pip_fullscreen"
- android:alpha="0"
- android:fontFamily="sans-serif"
- android:textSize="12sp"
- android:textColor="#EEEEEE"
- android:importantForAccessibility="no" />
-</merge>
diff --git a/packages/SystemUI/res/layout/tv_pip_controls.xml b/packages/SystemUI/res/layout/tv_pip_controls.xml
deleted file mode 100644
index 0b7bce13d761..000000000000
--- a/packages/SystemUI/res/layout/tv_pip_controls.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Layout for {@link com.android.systemui.pip.tv.PipControlsView}. -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
- <com.android.systemui.pip.tv.PipControlButtonView
- android:id="@+id/full_button"
- android:layout_width="@dimen/picture_in_picture_button_width"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_fullscreen_white_24dp"
- android:text="@string/pip_fullscreen" />
-
- <com.android.systemui.pip.tv.PipControlButtonView
- android:id="@+id/close_button"
- android:layout_width="@dimen/picture_in_picture_button_width"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/picture_in_picture_button_start_margin"
- android:src="@drawable/ic_close_white"
- android:text="@string/pip_close" />
-
- <com.android.systemui.pip.tv.PipControlButtonView
- android:id="@+id/play_pause_button"
- android:layout_width="@dimen/picture_in_picture_button_width"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/picture_in_picture_button_start_margin"
- android:src="@drawable/ic_pause_white"
- android:text="@string/pip_pause"
- android:visibility="gone" />
-</merge>