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

Commit 9fd74805 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

More work on rotation animation. 

The black frame is now a separate animation element.  This allows us
to have it move through the aspect ratio change, without the old
and new screen elements doing weird aspect ratio scalings.  This
makes the animation generally look different (more like a reveal),
not sure if it is better or worse, but definitely has less artifacts
in things like the gallery.

Also tweaked the animation definitions a bit.

Change-Id: I94c274ba04bbc7a675946dc6c1778e19386e4a66
parent f8acebe4

core/res/res/anim/screen_rotate_0_frame.xml

0 → 100644
+25 −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">

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

            android:interpolator="@interpolator/decelerate_quint"

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

</set>

core/res/res/anim/screen_rotate_180_frame.xml

0 → 100644
+28 −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">

    <rotate android:fromDegrees="180" 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>

core/res/res/anim/screen_rotate_finish_enter.xml

+6 −4
Original line number Diff line number Diff line
@@ -19,13 +19,14 @@ 


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

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

            android:fromYScale="1.0" android:toYScale="1.1111111111111"

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

            android:interpolator="@interpolator/decelerate_quint"

            android:interpolator="@interpolator/accelerate_decelerate"

            android:fillEnabled="true"

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

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

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

    <!--

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

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

            android:pivotX="50%" android:pivotY="50%"
@@ -33,4 +34,5 @@ 
            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

+7 −9
Original line number Diff line number Diff line
@@ -19,23 +19,21 @@ 


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

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

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

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

            android:interpolator="@interpolator/decelerate_quint"

            android:interpolator="@interpolator/accelerate_decelerate"

            android:fillEnabled="true"

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

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

    <!--

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

    <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:interpolator="@interpolator/accelerate_decelerate"

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

    -->

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

            android:interpolator="@interpolator/decelerate_quint"

            android:interpolator="@interpolator/accelerate_decelerate"

            android:fillEnabled="true"

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

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

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

</set>

core/res/res/anim/screen_rotate_finish_frame.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.1111111111111"

            android:fromYScale="1.0" android:toYScale="1.1111111111111"

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

            android:interpolator="@interpolator/accelerate_decelerate"

            android:fillEnabled="true"

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

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

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

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

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

            android:fillEnabled="true"

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

            android:interpolator="@interpolator/accelerate_decelerate"

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

</set>