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

Commit e577e042 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "3/ Remove legacy recents animation logic" into main

parents 13caf834 e4041f0e

core/java/com/android/internal/statusbar/IStatusBar.aidl

+0 −5
Original line number Diff line number Diff line
@@ -208,11 +208,6 @@ oneway interface IStatusBar 
     */

    void onDisplayReady(int displayId);



    /**

     * Notifies System UI whether the recents animation is running or not.

     */

    void onRecentsAnimationStateChanged(boolean running);



    /**

     * Notifies System UI side of system bar attribute change on the specified display.

     *

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+0 −4
Original line number Diff line number Diff line
@@ -562,10 +562,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 
        return false;

    }



    @Override

    public void onRecentsAnimationStateChanged(boolean running) {

    }



    @Override

    public void onNavigationModeChanged(int mode) {

        mNavigationMode = mode;

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+1 −1
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ public class CommandQueue extends IStatusBar.Stub implements 
        }

    }



    @Override

    // This was previously called from WM, but is now called from WMShell

    public void onRecentsAnimationStateChanged(boolean running) {

        synchronized (mLock) {

            mHandler.obtainMessage(MSG_RECENTS_ANIMATION_STATE_CHANGED, running ? 1 : 0, 0)

services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java

+0 −4
Original line number Diff line number Diff line
@@ -594,10 +594,6 @@ public class AccessibilityWindowManager { 


        private boolean windowMattersToAccessibilityLocked(AccessibilityWindow a11yWindow,

                int windowId, Region regionInScreen, Region unaccountedSpace) {

            if (a11yWindow.ignoreRecentsAnimationForAccessibility()) {

                return false;

            }



            if (a11yWindow.isFocused()) {

                return true;

            }

services/core/java/com/android/server/policy/PhoneWindowManager.java

+0 −10
Original line number Diff line number Diff line
@@ -1076,16 +1076,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    private void interceptPowerKeyUp(KeyEvent event, boolean canceled) {

        // Inform the StatusBar; but do not allow it to consume the event.

        sendSystemKeyToStatusBarAsync(event);



        final boolean handled = canceled || mPowerKeyHandled;



        if (!handled) {

            if ((event.getFlags() & KeyEvent.FLAG_LONG_PRESS) == 0) {

                // Abort possibly stuck animations only when power key up without long press case.

                mHandler.post(mWindowManagerFuncs::triggerAnimationFailsafe);

            }

        }



        finishPowerKeyPress();

    }