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

Commit 11aba31e authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Update animations in QS" into oc-dr1-dev 

am: 497d73f3

Change-Id: I64226ee9f79dc94e2009d27572b85b1668bff3d7
parents e49c3675 497d73f3

packages/SystemUI/res/anim/error_to_trustedstate_bottompath_animation.xml

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

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

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

    <objectAnimator

        android:duration="283"

        android:propertyName="pathData"

        android:valueFrom="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z"

        android:valueTo="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"

        android:valueType="pathType"

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

</set>

packages/SystemUI/res/anim/ic_volume_expand_chevron_01_animation.xml→packages/SystemUI/res/anim/error_to_trustedstate_circlepath_animation.xml

+11 −11
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2015 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?>

<!-- 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.
@@ -13,13 +13,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="250"

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

        android:pathData="M 12.0,15.0 c 0.0,-1.0 0.0,-5.33333 0.0,-6.0"

        android:propertyXName="translateX"

        android:propertyYName="translateY" />



        android:duration="383"

        android:propertyName="trimPathEnd"

        android:valueFrom="1.0"

        android:valueTo="0.0"

        android:valueType="floatType"

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

</set>

packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml

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

<!--

Copyright (C) 2015 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.
@@ -16,31 +15,21 @@ Copyright (C) 2015 The Android Open Source Project 
-->

<set

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

        android:duration="600"

        android:propertyName="strokeColor"

        android:valueFrom="#FFF3511E"

        android:valueTo="#FFFFFFFF"

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

    <objectAnimator

        android:duration="600"

        android:propertyName="strokeAlpha"

        android:valueFrom="1.0"

        android:valueTo="0.5"

        android:valueType="floatType"

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

    <objectAnimator

        android:duration="383"

        android:propertyName="trimPathStart"

        android:valueFrom="0.5001"

        android:valueTo="0.0"

        android:valueType="floatType"

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

            android:duration="350"

            android:propertyName="pathData"

            android:valueFrom="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"

            android:valueTo="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"

            android:valueType="pathType"

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

        <objectAnimator

        android:duration="383"

        android:propertyName="trimPathEnd"

        android:valueFrom="1.5"

        android:valueTo="0.0"

        android:valueType="floatType"

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

            android:duration="200"

            android:propertyName="pathData"

            android:valueFrom="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"

            android:valueTo="M 0.0,-1.988645 c 1.09829830627,0.0 1.988645,0.890346693734 1.988645,1.988645 c 0.0,1.09829830627 -0.890346693734,1.988645 -1.988645,1.988645 c -1.09829830627,0.0 -1.988645,-0.890346693734 -1.988645,-1.988645 c 0.0,-1.09829830627 0.890346693734,-1.988645 1.988645,-1.988645 Z"

            android:valueType="pathType"

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

    </set>

</set>

packages/SystemUI/res/anim/error_to_trustedstate_errorcircle_animation.xml

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

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

     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="33"

            android:propertyName="rotation"

            android:valueFrom="5.0"

            android:valueTo="5.0"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="366"

            android:propertyName="rotation"

            android:valueFrom="5.0"

            android:valueTo="-180.0"

            android:valueType="floatType"

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

    </set>

</set>

packages/SystemUI/res/anim/ic_volume_collapse_rectangle_1_animation.xml→packages/SystemUI/res/anim/error_to_trustedstate_errorexclamationdot_animation.xml

+10 −12
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2015 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?>

<!-- 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.
@@ -13,14 +13,12 @@ 
     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="200"

        android:interpolator="@interpolator/ic_volume_collapse_animation_interpolator_0"

        android:propertyName="rotation"

        android:valueFrom="45.0"

        android:valueTo="-45.0"

        android:valueType="floatType" />



        android:duration="283"

        android:propertyXName="translateX"

        android:propertyYName="translateY"

        android:pathData="M 12.0,12.0 c 0.0,-0.66667 0.0,-3.33333 0.0,-4.0"

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

</set>