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

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

Merge "PIP: Apply the latest Recents row animation when PIP control is focused" into nyc-dev

parents 841b49bc 04cbe870

packages/SystemUI/res/drawable/tv_pip_close_button.xml

+14 −2
Original line number Diff line number Diff line
@@ -19,8 +19,20 @@ 
    <item android:state_focused="true">

        <layer-list>

            <item android:drawable="@drawable/tv_pip_button_focused" />

            <item android:drawable="@drawable/ic_close_white" />

            <item android:drawable="@drawable/ic_close_white"

                android:top="@dimen/tv_pip_button_icon_padding"

                android:bottom="@dimen/tv_pip_button_icon_padding"

                android:left="@dimen/tv_pip_button_icon_padding"

                android:right="@dimen/tv_pip_button_icon_padding" />

        </layer-list>

    </item>

    <item>

        <layer-list>

            <item android:drawable="@drawable/ic_close_white"

                android:top="@dimen/tv_pip_button_icon_padding"

                android:bottom="@dimen/tv_pip_button_icon_padding"

                android:left="@dimen/tv_pip_button_icon_padding"

                android:right="@dimen/tv_pip_button_icon_padding" />

        </layer-list>

    </item>

    <item android:drawable="@drawable/ic_close_white" />

</selector>

packages/SystemUI/res/drawable/tv_pip_full_button.xml

+14 −2
Original line number Diff line number Diff line
@@ -19,8 +19,20 @@ 
    <item android:state_focused="true">

        <layer-list>

            <item android:drawable="@drawable/tv_pip_button_focused" />

            <item android:drawable="@drawable/ic_fullscreen_white_24dp" />

            <item android:drawable="@drawable/ic_fullscreen_white_24dp"

                android:top="@dimen/tv_pip_button_icon_padding"

                android:bottom="@dimen/tv_pip_button_icon_padding"

                android:left="@dimen/tv_pip_button_icon_padding"

                android:right="@dimen/tv_pip_button_icon_padding" />

        </layer-list>

    </item>

    <item>

        <layer-list>

            <item android:drawable="@drawable/ic_fullscreen_white_24dp"

                android:top="@dimen/tv_pip_button_icon_padding"

                android:bottom="@dimen/tv_pip_button_icon_padding"

                android:left="@dimen/tv_pip_button_icon_padding"

                android:right="@dimen/tv_pip_button_icon_padding" />

        </layer-list>

    </item>

    <item android:drawable="@drawable/ic_fullscreen_white_24dp" />

</selector>

packages/SystemUI/res/drawable/tv_pip_pause_button.xml

+14 −2
Original line number Diff line number Diff line
@@ -19,8 +19,20 @@ 
    <item android:state_focused="true">

        <layer-list>

            <item android:drawable="@drawable/tv_pip_button_focused" />

            <item android:drawable="@drawable/ic_pause_white_24dp" />

            <item android:drawable="@drawable/ic_pause_white_24dp"

                android:top="@dimen/tv_pip_button_icon_padding"

                android:bottom="@dimen/tv_pip_button_icon_padding"

                android:left="@dimen/tv_pip_button_icon_padding"

                android:right="@dimen/tv_pip_button_icon_padding" />

        </layer-list>

    </item>

    <item>

        <layer-list>

            <item android:drawable="@drawable/ic_pause_white_24dp"

                android:top="@dimen/tv_pip_button_icon_padding"

                android:bottom="@dimen/tv_pip_button_icon_padding"

                android:left="@dimen/tv_pip_button_icon_padding"

                android:right="@dimen/tv_pip_button_icon_padding" />

        </layer-list>

    </item>

    <item android:drawable="@drawable/ic_pause_white_24dp" />

</selector>

packages/SystemUI/res/drawable/tv_pip_play_button.xml

+14 −2
Original line number Diff line number Diff line
@@ -19,8 +19,20 @@ 
    <item android:state_focused="true">

        <layer-list>

            <item android:drawable="@drawable/tv_pip_button_focused" />

            <item android:drawable="@drawable/ic_play_arrow_white_24dp" />

            <item android:drawable="@drawable/ic_play_arrow_white_24dp"

                android:top="@dimen/tv_pip_button_icon_padding"

                android:bottom="@dimen/tv_pip_button_icon_padding"

                android:left="@dimen/tv_pip_button_icon_padding"

                android:right="@dimen/tv_pip_button_icon_padding" />

        </layer-list>

    </item>

    <item>

        <layer-list>

            <item android:drawable="@drawable/ic_play_arrow_white_24dp"

                android:top="@dimen/tv_pip_button_icon_padding"

                android:bottom="@dimen/tv_pip_button_icon_padding"

                android:left="@dimen/tv_pip_button_icon_padding"

                android:right="@dimen/tv_pip_button_icon_padding" />

        </layer-list>

    </item>

    <item android:drawable="@drawable/ic_play_arrow_white_24dp" />

</selector>

packages/SystemUI/res/values/dimens_tv.xml

+2 −0
Original line number Diff line number Diff line
@@ -54,5 +54,7 @@ 


    <!-- Extra space around the PIP and its outline in PIP onboarding activity  -->

    <dimen name="tv_pip_bounds_space">3dp</dimen>

    <!-- Extra space around the PIP control button icon to match with the focused circle -->

    <dimen name="tv_pip_button_icon_padding">5dp</dimen>



</resources>