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

Commit 802320ef authored by Evan Laird's avatar Evan Laird
Browse files

Update auto rotate / portrait QS icon 

Animations and new icon for auto rotate. No landscape included here.

Test: visual
Bug: 62386498
Change-Id: If2862c24bed78be2110b2d58d1b4326b04b40c9d
parent e644b8cf

packages/SystemUI/res/anim/ic_portrait_to_auto_rotate_animation_arrows.xml

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

<!--

     Copyright (C) 2014 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.

-->

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="133"

            android:propertyName="scaleX"

            android:valueFrom="0.9"

            android:valueTo="0.9"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="333"

            android:propertyName="scaleX"

            android:valueFrom="0.9"

            android:valueTo="1"

            android:interpolator="@android:interpolator/linear" />

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="133"

            android:propertyName="scaleY"

            android:valueFrom="0.9"

            android:valueTo="0.9"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="333"

            android:propertyName="scaleY"

            android:valueFrom="0.9"

            android:valueTo="1"

            android:interpolator="@android:interpolator/linear" />

    </set>

    <objectAnimator

        android:duration="617"

        android:propertyName="rotation"

        android:valueFrom="-221"

        android:valueTo="0"

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

</set>

packages/SystemUI/res/anim/ic_portrait_from_auto_rotate_animation_arrows.xml→packages/SystemUI/res/anim/ic_portrait_to_rotate_arrows_0_animation.xml

+15 −16
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2014 The Android Open Source Project

     Copyright (C) 2017 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.
@@ -14,41 +14,40 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<set

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="117"

            android:duration="116"

            android:propertyName="scaleX"

            android:valueFrom="1"

            android:valueTo="1"

            android:valueFrom="1.0"

            android:valueTo="1.0"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="333"

            android:propertyName="scaleX"

            android:valueFrom="1"

            android:valueFrom="1.0"

            android:valueTo="0.9"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="117"

            android:duration="116"

            android:propertyName="scaleY"

            android:valueFrom="1"

            android:valueTo="1"

            android:valueFrom="1.0"

            android:valueTo="1.0"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="333"

            android:propertyName="scaleY"

            android:valueFrom="1"

            android:valueFrom="1.0"

            android:valueTo="0.9"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

    </set>

    <objectAnimator

        android:duration="617"

        android:propertyName="rotation"

        android:valueFrom="0"

        android:valueTo="-221"

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

</set>

packages/SystemUI/res/anim/ic_portrait_to_auto_rotate_animation_arrow_top.xml→packages/SystemUI/res/anim/ic_portrait_to_rotate_arrows_animation.xml

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

<!--

     Copyright (C) 2014 The Android Open Source Project

     Copyright (C) 2017 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.
@@ -14,20 +14,13 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<set

        android:ordering="sequentially" >

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

    <objectAnimator

            android:duration="50"

            android:propertyName="fillAlpha"

            android:valueFrom="0"

            android:valueTo="0"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="83"

            android:propertyName="fillAlpha"

            android:valueFrom="0"

            android:valueTo="1"

            android:interpolator="@android:interpolator/linear" />

    </set>

        android:duration="616"

        android:propertyName="rotation"

        android:valueFrom="0.0"

        android:valueTo="-221.0"

        android:valueType="floatType"

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

</set>

packages/SystemUI/res/anim/ic_portrait_from_auto_rotate_animation_arrow_bottom.xml→packages/SystemUI/res/anim/ic_portrait_to_rotate_bottom_merged_animation.xml

+9 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2014 The Android Open Source Project

     Copyright (C) 2017 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.
@@ -14,20 +14,23 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<set

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="400"

            android:propertyName="fillAlpha"

            android:valueFrom="1"

            android:valueTo="1"

            android:valueFrom="1.0"

            android:valueTo="1.0"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="83"

            android:propertyName="fillAlpha"

            android:valueFrom="1"

            android:valueTo="0"

            android:valueFrom="1.0"

            android:valueTo="0.0"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

    </set>

</set>

packages/SystemUI/res/anim/ic_portrait_from_auto_rotate_animation_device.xml→packages/SystemUI/res/anim/ic_portrait_to_rotate_device_0_animation.xml

+6 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2014 The Android Open Source Project

     Copyright (C) 2017 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.
@@ -14,11 +14,13 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<set

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

    <objectAnimator

        android:duration="400"

        android:propertyName="rotation"

        android:valueFrom="0"

        android:valueTo="-135"

        android:valueFrom="0.0"

        android:valueTo="-135.0"

        android:valueType="floatType"

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

</set>