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

Commit 84ab79c7 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 25873 into eclair 

* changes:
  Fix transformation on windows.
parents 27272bfa 65c23872

core/res/res/anim/dialog_enter.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:interpolator="@anim/decelerate_interpolator">

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

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

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

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

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

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

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

core/res/res/anim/dialog_exit.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:interpolator="@anim/accelerate_interpolator">

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

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

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

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

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

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

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

core/res/res/anim/recent_enter.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:interpolator="@anim/decelerate_interpolator">

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

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

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

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

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

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

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

core/res/res/anim/recent_exit.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:zAdjustment="top">

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

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

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

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

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

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

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

services/java/com/android/server/WindowManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -7319,10 +7319,11 @@ public class WindowManagerService extends IWindowManager.Stub 
                final Matrix tmpMatrix = mTmpMatrix;



                // Compute the desired transformation.

                tmpMatrix.setTranslate(frame.left, frame.top);

                tmpMatrix.setTranslate(0, 0);

                if (selfTransformation) {

                    tmpMatrix.postConcat(mTransformation.getMatrix());

                }

                tmpMatrix.postTranslate(frame.left, frame.top);

                if (attachedTransformation != null) {

                    tmpMatrix.postConcat(attachedTransformation.getMatrix());

                }