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

Commit fd1c5ed3 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

New screen rotation animation design. 

We now have an animation that can start as soon as we detect to
rotate the screen, and have a different phase once the new UI
is ready to complete the transition into it.

Change-Id: I05b9c12a699232acbddc36b4a994a4452db71476
parent a6b8fe1c

core/res/res/anim/screen_rotate_180_enter.xml

+5 −11
Original line number Diff line number Diff line
@@ -19,16 +19,10 @@ 


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

        android:shareInterpolator="false">

    <scale android:fromXScale="1.0" android:toXScale="1.0"

            android:fromYScale=".9" android:toYScale="1.0"

            android:pivotX="50%p" android:pivotY="50%p"

            android:fillEnabled="true" android:fillBefore="true"

    <rotate android:fromDegrees="180" android:toDegrees="0"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:startOffset="160"

            android:duration="300" />

    <alpha android:fromAlpha="0" android:toAlpha="1.0"

            android:fillEnabled="true" android:fillBefore="true"

            android:interpolator="@interpolator/decelerate_quint"

            android:startOffset="160"

            android:duration="300"/>

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

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

</set>
 
 No newline at end of file

core/res/res/anim/screen_rotate_180_exit.xml

+6 −8
Original line number Diff line number Diff line
@@ -19,12 +19,10 @@ 


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

        android:shareInterpolator="false">

    <scale android:fromXScale="1.0" android:toXScale="1.0"

            android:fromYScale="1.0" android:toYScale="0.0"

            android:pivotX="50%p" android:pivotY="50%p"

            android:interpolator="@interpolator/accelerate_cubic"

            android:duration="160" />

    <alpha android:fromAlpha="1.0" android:toAlpha="0"

            android:interpolator="@interpolator/decelerate_cubic"

            android:duration="160"/>

    <rotate android:fromDegrees="0" android:toDegrees="-180"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

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

</set>
 
 No newline at end of file

core/res/res/anim/screen_rotate_finish_enter.xml

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

<!--

/*

** Copyright 2012, 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:shareInterpolator="false">

    <scale android:fromXScale="1.0" android:toXScale="1.25"

            android:fromYScale="1.0" android:toYScale="1.25"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

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

    <scale android:fromXScale="100%p" android:toXScale="100%"

            android:fromYScale="100%p" android:toYScale="100%"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

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

</set>

core/res/res/anim/screen_rotate_finish_exit.xml

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

<!--

/*

** Copyright 2012, 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:shareInterpolator="false">

    <scale android:fromXScale="1.0" android:toXScale="1.25"

            android:fromYScale="1.0" android:toYScale="1.25"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="true"

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

    <!--

    <scale android:fromXScale="100%" android:toXScale="100%p"

            android:fromYScale="100%" android:toYScale="100%p"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

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

    -->

    <alpha android:fromAlpha="1.0" android:toAlpha="0"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

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

</set>

core/res/res/anim/screen_rotate_minus_90_enter.xml

+36 −0
Original line number Diff line number Diff line
@@ -19,8 +19,44 @@ 


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

        android:shareInterpolator="false">

    <!--

    <scale android:fromXScale="1.0" android:toXScale="0.565"

            android:fromYScale="1.0" android:toYScale="0.565"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="true"

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

    <scale android:fromXScale="1.0" android:toXScale="1.777777777"

            android:fromYScale="1.0" android:toYScale="1.777777777"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="true"

            android:startOffset="@android:integer/config_longAnimTime"

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

    <scale android:fromXScale="100%p" android:toXScale="100%"

            android:fromYScale="100%p" android:toYScale="100%"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

            android:startOffset="@android:integer/config_longAnimTime"

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

    -->

    <!--

    <scale android:fromXScale="100%p" android:toXScale="100%"

            android:fromYScale="100%p" android:toYScale="100%"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

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

    -->

    <rotate android:fromDegrees="-90" android:toDegrees="0"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:fillEnabled="true"

            android:fillBefore="true" android:fillAfter="true"

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

</set>