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

Commit 737458b0 authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into... 

Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am: f8c504db am: 9e78ee80
am: a8d75f8c

* commit 'a8d75f8c':
  PIP: Improve PIP control row's focus change animation in Recents

Change-Id: Ie274501fa85bbee8c7d7accc37bdd420158799dd
parents d28d0dad a8d75f8c

packages/SystemUI/res/layout-television/recents_on_tv.xml

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:clipChildren="false"

    android:clipToPadding="false"

    android:background="@drawable/recents_tv_background_gradient">



    <com.android.systemui.recents.tv.views.TaskStackHorizontalGridView

        android:id="@+id/task_list"

        android:layout_width="wrap_content"
@@ -32,13 +33,13 @@ 
        android:focusable="true"

        android:layoutDirection="rtl" />



    <!-- Placeholder view to give focus to the PIP menus. -->

    <!-- Placeholder view to give focus to the PIP menus in talkback mode -->

    <View

        android:id="@+id/pip"

        android:layout_width="1dp"

        android:layout_height="1dp"

        android:focusable="true"

        android:visibility="visible" />

        android:visibility="gone" />



    <!-- Placeholder to dismiss during talkback. -->

    <ImageView

packages/SystemUI/res/layout/tv_pip_control_button.xml

+14 −4
Original line number Diff line number Diff line
@@ -23,15 +23,25 @@ 
    <ImageView android:id="@+id/button"

        android:layout_width="34dp"

        android:layout_height="34dp"

        android:padding="5dp"

        android:layout_alignParentTop="true"

        android:layout_centerHorizontal="true"

        android:focusable="true"

        android:src="@drawable/ic_fullscreen_white_24dp"

        android:background="@drawable/tv_pip_button_focused"

        android:layerType="software" />

        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"