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

Commit 2cea8798 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Update systemui animations to GM2. 

- Update wifi, bluetooth and hotspot transient animations for pixel and
3 themes
- Move animations from SystemUI to framework so they can be overlayed
(resources cannot reference other resources that only exist in the
target package)
- Remove unused animations
- Holding off on themed lockscreen animations until they are all
complete
- Note that expand/collapse animations are not overlayed since they are
not used in production code (only tuner)

Fixes: 118757654
Test: visual
Change-Id: Id66a2f76ff1f46b2e32f61b709b648aa0fa49672
parent fa2e9939

core/res/res/anim/ic_bluetooth_transient_animation_0.xml

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

<!--

  ~ Copyright (C) 2019 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" android:ordering="together">

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="0" android:valueFrom="1" android:valueTo="0.5"

                    android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="233"

                    android:startOffset="17" android:valueFrom="0.5"

                    android:valueTo="0.5" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="250" android:valueFrom="0.5"

                    android:valueTo="1" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="233"

                    android:startOffset="267" android:valueFrom="1" android:valueTo="1"

                    android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="500" android:valueFrom="1"

                    android:valueTo="0.5" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="233"

                    android:startOffset="517" android:valueFrom="0.5"

                    android:valueTo="0.5" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="750" android:valueFrom="0.5"

                    android:valueTo="1" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

</set>

core/res/res/anim/ic_bluetooth_transient_animation_1.xml

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

<!--

  ~ Copyright (C) 2019 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" android:ordering="together">

    <objectAnimator android:propertyName="fillAlpha" android:duration="250"

                    android:startOffset="0" android:valueFrom="1" android:valueTo="1"

                    android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="250" android:valueFrom="1"

                    android:valueTo="0.5" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="233"

                    android:startOffset="267" android:valueFrom="0.5"

                    android:valueTo="0.5" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="500" android:valueFrom="0.5"

                    android:valueTo="1" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="233"

                    android:startOffset="517" android:valueFrom="1" android:valueTo="1"

                    android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="750" android:valueFrom="1"

                    android:valueTo="0.5" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

</set>

core/res/res/anim/ic_bluetooth_transient_animation_2.xml

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

<!--

  ~ Copyright (C) 2019 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" android:ordering="together">

    <objectAnimator android:propertyName="translateX" android:duration="1000"

                    android:startOffset="0" android:valueFrom="0" android:valueTo="1"

                    android:valueType="floatType"/>

</set>

core/res/res/anim/ic_hotspot_transient_animation_0.xml

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

<!--

  ~ Copyright (C) 2019 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" android:ordering="together">

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="0" android:valueFrom="1" android:valueTo="0.5"

                    android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="633"

                    android:startOffset="17" android:valueFrom="0.5"

                    android:valueTo="0.5" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="650" android:valueFrom="0.5"

                    android:valueTo="1" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

</set>

core/res/res/anim/ic_hotspot_transient_animation_1.xml

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

<!--

  ~ Copyright (C) 2019 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" android:ordering="together">

    <objectAnimator android:propertyName="fillAlpha" android:duration="200"

                    android:startOffset="0" android:valueFrom="1" android:valueTo="1"

                    android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="200" android:valueFrom="1"

                    android:valueTo="0.5" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="617"

                    android:startOffset="217" android:valueFrom="0.5"

                    android:valueTo="0.5" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

    <objectAnimator android:propertyName="fillAlpha" android:duration="17"

                    android:startOffset="833" android:valueFrom="0.5"

                    android:valueTo="1" android:valueType="floatType"

                    android:interpolator="@*android:interpolator/transient_interpolator"/>

</set>