Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6d383d1 authored by Jaewan Kim's avatar Jaewan Kim Committed by Android (Google) Code Review
Browse files

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

parents 15aac69c 2e27de2e

packages/SystemUI/res/layout/tv_pip_controls.xml

+3 −3
Original line number Diff line number Diff line
@@ -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"