Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PIP: Fix runtime crash in System UI" into nyc-dev

Browse Source 
am: a6d383d

* commit 'a6d383d1028b8e44c54e58019540cb586a044a3e':
  PIP: Fix runtime crash in System UI

Change-Id: I42d350c3d4ac82cf208d95298fcf83c682f4f69f
This commit is contained in:
Jaewan Kim
2016-04-14 06:36:07 +00:00
committed by android-build-merger
parent a19762765d a6d383d102
commit a6d0da0662
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res/layout/tv_pip_controls.xml
View File

@@ -20,14 +20,14 @@
<!-- Layout for {@link com.android.systemui.tv.pip.PipControlsView}. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<com.android.systemui.tv.pip.PipControlsButtonView
<com.android.systemui.tv.pip.PipControlButtonView
android:id="@+id/full_button"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:src="@drawable/ic_fullscreen_white_24dp"
android:text="@string/pip_fullscreen" />
<com.android.systemui.tv.pip.PipControlsButtonView
<com.android.systemui.tv.pip.PipControlButtonView
android:id="@+id/close_button"
android:layout_width="100dp"
android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
android:src="@drawable/ic_close_white"
android:text="@string/pip_close" />
<com.android.systemui.tv.pip.PipControlsButtonView
<com.android.systemui.tv.pip.PipControlButtonView
android:id="@+id/play_pause_button"
android:layout_width="100dp"
android:layout_height="wrap_content"