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

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

Merge "PIP: Implement focus change animation in PIP control buttons" into nyc-dev 

am: 6309cabc

* commit '6309cabc':
  PIP: Implement focus change animation in PIP control buttons

Change-Id: I0d5121aae90d5d39b4a2930a05419ac5806e0718
parents 5ab0315a 6309cabc

packages/SystemUI/res/anim/tv_pip_controls_text_in_recents_focus_gain_animation.xml→packages/SystemUI/res/anim/tv_pip_controls_text_focus_gain_animation.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
    android:propertyName="alpha"

    android:valueTo="1"

    android:interpolator="@android:interpolator/fast_out_slow_in"

    android:duration="@integer/recents_tv_pip_focus_anim_duration" />
 
    android:duration="100" />

packages/SystemUI/res/anim/tv_pip_controls_text_in_recents_focus_lose_animation.xml→packages/SystemUI/res/anim/tv_pip_controls_text_focus_lose_animation.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
    android:propertyName="alpha"

    android:valueTo="0"

    android:interpolator="@android:interpolator/fast_out_slow_in"

    android:duration="@integer/recents_tv_pip_focus_anim_duration" />
 
    android:duration="100" />

packages/SystemUI/res/drawable/tv_pip_close_button.xml→packages/SystemUI/res/anim/tv_pip_menu_fade_in_animation.xml

+21 −0
Original line number Diff line number Diff line
@@ -14,25 +14,8 @@ 
     limitations under the License.

-->



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

    android:constantSize="true">

    <item android:state_focused="true">

        <layer-list>

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

            <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>

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

    android:propertyName="alpha"

    android:valueTo="1"

    android:interpolator="@android:interpolator/fast_out_slow_in"

    android:duration="100" />

packages/SystemUI/res/drawable/tv_pip_pause_button.xml→packages/SystemUI/res/anim/tv_pip_menu_fade_out_animation.xml

+21 −0
Original line number Diff line number Diff line
@@ -14,25 +14,8 @@ 
     limitations under the License.

-->



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

    android:constantSize="true">

    <item android:state_focused="true">

        <layer-list>

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

            <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>

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

    android:propertyName="alpha"

    android:valueTo="0"

    android:interpolator="@android:interpolator/fast_out_slow_in"

    android:duration="100" />

packages/SystemUI/res/drawable/tv_pip_button_focused.xml

+2 −8
Original line number Diff line number Diff line
@@ -14,11 +14,5 @@ 
     limitations under the License.

-->



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

    android:shape="oval">

    <size

        android:width="34dp"

        android:height="34dp" />

    <solid

        android:color="#4DFFFFFF" />

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

    android:color="#9AFFFFFF" android:radius="17dp" />