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

Commit 870d30f9 authored by Kyrylo Mikos's avatar Kyrylo Mikos
Browse files

Revert "PhoneWindowManager: Delay setting updates during window animation." 

This reverts commit 00295091.

Conflicts:

	core/java/android/view/WindowManagerPolicy.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/wm/WindowAnimator.java

Change-Id: Ice177d099a9865848c9919f3452bb0f1d28ae81a
parent 61941dd7

core/java/android/view/WindowManagerPolicy.java

+0 −11
Original line number Diff line number Diff line
@@ -1202,15 +1202,4 @@ public interface WindowManagerPolicy { 
     * @param enabled Whether touch exploration is enabled.

     */

    public void setTouchExplorationEnabled(boolean enabled);



    /**

     * A window animation has been scheduled

     */

    public void windowAnimationStarted();



    /**

     * Animating windows has finished

     */

    public void windowAnimationFinished();



}

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+2 −25
Original line number Diff line number Diff line
@@ -358,8 +358,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    // Behavior of volbtn music controls

    boolean mVolBtnMusicControls;

    boolean mIsLongPress;

    private boolean mAnimatingWindows;

    private boolean mNeedUpdateSettings;

    private boolean mClearedBecauseOfForceShow;



    private final class PointerLocationPointerEventListener implements PointerEventListener {
@@ -668,16 +666,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }



        @Override public void onChange(boolean selfChange) {

            // A settings update potentially means triggering a configuration change,

            // which we don't want to do during a window animation

            if (mAnimatingWindows) {

                mNeedUpdateSettings = true;

            } else {

            updateSettings();

            updateRotation(false);

        }

    }

    }



    class MyOrientationListener extends WindowOrientationListener {

        MyOrientationListener(Context context, Handler handler) {
@@ -5922,21 +5914,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        return true;

    }



    @Override

    public void windowAnimationStarted() {

        mAnimatingWindows = true;

    }



    @Override

    public void windowAnimationFinished() {

        mAnimatingWindows = false;

        if (mNeedUpdateSettings) {

            updateSettings();

            updateRotation(false);

            mNeedUpdateSettings = false;

        }

    }



    @Override

    public void dump(String prefix, PrintWriter pw, String[] args) {

        pw.print(prefix); pw.print("mSafeMode="); pw.print(mSafeMode);

services/java/com/android/server/wm/WindowAnimator.java

+0 −1
Original line number Diff line number Diff line
@@ -568,7 +568,6 @@ public class WindowAnimator { 
        }



        if (!mAnimating && wasAnimating) {

            mPolicy.windowAnimationFinished();

            mService.requestTraversalLocked();

        }

        if (WindowManagerService.DEBUG_WINDOW_TRACE) {

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

+0 −1
Original line number Diff line number Diff line
@@ -9566,7 +9566,6 @@ public class WindowManagerService extends IWindowManager.Stub 
    void scheduleAnimationLocked() {

        if (!mAnimationScheduled) {

            mAnimationScheduled = true;

            mPolicy.windowAnimationStarted();

            mChoreographer.postCallback(

                    Choreographer.CALLBACK_ANIMATION, mAnimator.mAnimationRunnable, null);

        }