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

Commit 6d5d927d authored by Vadim Caen's avatar Vadim Caen Committed by Android (Google) Code Review
Browse files

Merge changes Icf19aba0,I7c9994ee,I8771a0e0,I0e1d82f1 

* changes:
  Clean up BlackFrame class
  Move ScreenRotationAnimation to DisplayContent
  Move rotation animation to Surface Runner
  Create a builder class to create Surface Animatable
parents 3afc6731 ec4f6827

core/res/res/anim/screen_rotate_0_exit.xml

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,4 @@ 


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

        android:shareInterpolator="false">

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

            android:interpolator="@interpolator/decelerate_quint"

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

</set>

core/res/res/anim/screen_rotate_180_exit.xml

+0 −3
Original line number Diff line number Diff line
@@ -25,7 +25,4 @@ 
            android:fillEnabled="true"

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

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

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

            android:interpolator="@interpolator/decelerate_cubic"

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

</set>
 
 No newline at end of file

core/res/res/anim/screen_rotate_minus_90_frame.xml→core/res/res/anim/screen_rotate_alpha.xml

+5 −6
Original line number Diff line number Diff line
@@ -19,10 +19,9 @@ 


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

        android:shareInterpolator="false">

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

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

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

           android:interpolator="@interpolator/decelerate_quint"

           android:fillEnabled="true"

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

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

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

</set>

core/res/res/anim/screen_rotate_minus_90_exit.xml

+0 −5
Original line number Diff line number Diff line
@@ -40,9 +40,4 @@ 
            android:fillEnabled="true"

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

            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_plus_90_exit.xml

+0 −5
Original line number Diff line number Diff line
@@ -40,9 +40,4 @@ 
            android:fillEnabled="true"

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

            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>