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

Commit 3e9f2f4d authored by Jaewan Kim's avatar Jaewan Kim
Browse files

resolve merge conflicts of b7c7f454 to master 

Change-Id: Icfc005c15943a5eced52d9aea17222b268e01e37
parents 132a74b0 b7c7f454

packages/SystemUI/res/anim/tv_pip_controls_fade_in.xml→packages/SystemUI/res/anim/tv_pip_controls_buttons_in_recents_focus_gain_animation.xml

+5 −5
Original line number Original line Diff line number Diff line
@@ -17,13 +17,13 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android">

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





    <objectAnimator

    <objectAnimator

        android:propertyName="translationY"

        android:propertyName="scaleX"

        android:valueTo="10dp"

        android:valueTo="1.0"

        android:interpolator="@android:interpolator/linear_out_slow_in"

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

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

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

    <objectAnimator

    <objectAnimator

        android:propertyName="alpha"

        android:propertyName="scaleY"

        android:valueTo="1.0"

        android:valueTo="1.0"

        android:interpolator="@android:interpolator/linear_out_slow_in"

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

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

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

</set>
 
</set>

packages/SystemUI/res/anim/tv_pip_controls_fade_out.xml→packages/SystemUI/res/anim/tv_pip_controls_buttons_in_recents_focus_lose_animation.xml

+6 −6
Original line number Original line Diff line number Diff line
@@ -17,13 +17,13 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android">

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





    <objectAnimator

    <objectAnimator

        android:propertyName="translationY"

        android:propertyName="scaleX"

        android:valueTo="0dp"

        android:valueTo="0.7"

        android:interpolator="@android:interpolator/fast_out_linear_in"

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

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

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

    <objectAnimator

    <objectAnimator

        android:propertyName="alpha"

        android:propertyName="scaleY"

        android:valueTo="0.0"

        android:valueTo="0.7"

        android:interpolator="@android:interpolator/fast_out_linear_in"

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

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

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

</set>
 
</set>

packages/SystemUI/res/anim/tv_pip_controls_in_recents_focus_gain_animation.xml

0 → 100644
+21 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    android:propertyName="translationY"

    android:valueTo="0dp"

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

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

packages/SystemUI/res/anim/tv_pip_controls_in_recents_focus_lose_animation.xml

0 → 100644
+21 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    android:propertyName="translationY"

    android:valueTo="-57dp"

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

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

packages/SystemUI/res/anim/tv_pip_controls_text_in_recents_focus_gain_animation.xml

0 → 100644
+21 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<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="@integer/recents_tv_pip_focus_anim_duration" />