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

Commit bf8c2c0f authored by Winson's avatar Winson Committed by Winson Chung
Browse files

Moving TV PIP logic to the PIP sub package. 

Test: Existing tests pass.
Change-Id: I4ca1f68d01206cb2fc7de27f3d445d6ac13d644a
parent 73bc159d

packages/SystemUI/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ 


        <!-- started from PipUI -->

        <activity

            android:name="com.android.systemui.tv.pip.PipMenuActivity"

            android:name=".pip.tv.PipMenuActivity"

            android:exported="true"

            android:theme="@style/PipTheme"

            android:launchMode="singleTop"
@@ -400,7 +400,7 @@ 
            androidprv:alwaysFocusable="true"

            android:excludeFromRecents="true" />

        <activity

            android:name="com.android.systemui.tv.pip.PipOverlayActivity"

            android:name=".pip.tv.PipOverlayActivity"

            android:exported="true"

            android:theme="@style/PipTheme"

            android:taskAffinity=""
@@ -409,7 +409,7 @@ 
            android:supportsPictureInPicture="true"

            android:excludeFromRecents="true" />

        <activity

            android:name="com.android.systemui.tv.pip.PipOnboardingActivity"

            android:name=".pip.tv.PipOnboardingActivity"

            android:exported="true"

            android:theme="@style/PipTheme"

            android:launchMode="singleTop"

packages/SystemUI/res/layout/tv_pip_control_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
*/

-->



<!-- Layout for {@link com.android.systemui.tv.pip.PipControlButtonView}. -->

<!-- Layout for {@link com.android.systemui.pip.tv.PipControlButtonView}. -->

<merge xmlns:android="http://schemas.android.com/apk/res/android">



    <ImageView android:id="@+id/button"

packages/SystemUI/res/layout/tv_pip_controls.xml

+4 −4
Original line number Diff line number Diff line
@@ -17,17 +17,17 @@ 
*/

-->



<!-- Layout for {@link com.android.systemui.tv.pip.PipControlsView}. -->

<!-- Layout for {@link com.android.systemui.pip.tv.PipControlsView}. -->

<merge xmlns:android="http://schemas.android.com/apk/res/android">



    <com.android.systemui.tv.pip.PipControlButtonView

    <com.android.systemui.pip.tv.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.PipControlButtonView

    <com.android.systemui.pip.tv.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.PipControlButtonView

    <com.android.systemui.pip.tv.PipControlButtonView

        android:id="@+id/play_pause_button"

        android:layout_width="100dp"

        android:layout_height="wrap_content"

packages/SystemUI/res/layout/tv_pip_menu.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    android:gravity="top|center_horizontal"

    android:clipChildren="false">



    <com.android.systemui.tv.pip.PipControlsView

    <com.android.systemui.pip.tv.PipControlsView

        android:id="@+id/pip_controls"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

packages/SystemUI/res/layout/tv_pip_recents_overlay.xml

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:gravity="top|center_horizontal"

    android:orientation="vertical">



    <com.android.systemui.tv.pip.PipRecentsControlsView

    <com.android.systemui.pip.tv.PipRecentsControlsView

        android:id="@+id/pip_controls"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -35,13 +35,13 @@ 
            android:layout_gravity="top|center_horizontal"

            android:background="@drawable/tv_pip_recents_overlay_scrim"

            android:alpha="0" />

        <com.android.systemui.tv.pip.PipControlsView

        <com.android.systemui.pip.tv.PipControlsView

            android:id="@+id/pip_control_contents"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="10dp"

            android:layout_gravity="top|center_horizontal" />

    </com.android.systemui.tv.pip.PipRecentsControlsView>

    </com.android.systemui.pip.tv.PipRecentsControlsView>



    <!-- Placeholder view to handle focus change between Recents row and PIP controls

        in talkback mode -->