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

Commit 793c798f authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Add log to verify display change is called" into sc-dev am: 550b33fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129970

Change-Id: Ia53d8c008c663cc17d0db340934ba3ddbedc781b
parents dc63457f 550b33fc
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -415,6 +415,9 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
        if (!mIsEnabled) {
            mGestureNavigationSettingsObserver.unregister();
            mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this);
            if (DEBUG_MISSING_GESTURE) {
                Log.d(DEBUG_MISSING_GESTURE_TAG, "Unregister display listener");
            }
            mPluginManager.removePluginListener(this);
            TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener);
            DeviceConfig.removeOnPropertiesChangedListener(mOnPropertiesChangedListener);
@@ -432,6 +435,9 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
            updateDisplaySize();
            mContext.getSystemService(DisplayManager.class).registerDisplayListener(this,
                    mContext.getMainThreadHandler());
            if (DEBUG_MISSING_GESTURE) {
                Log.d(DEBUG_MISSING_GESTURE_TAG, "Register display listener");
            }
            TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackListener);
            DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI,
                    runnable -> (mContext.getMainThreadHandler()).post(runnable),
@@ -817,6 +823,10 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
            updateDisabledForQuickstep();
        }

        if (DEBUG_MISSING_GESTURE) {
            Log.d(DEBUG_MISSING_GESTURE_TAG, "Display changed: mDisplayId=" + mDisplayId
                    + " displayId=" + displayId);
        }
        if (displayId == mDisplayId) {
            updateDisplaySize();
        }
@@ -824,6 +834,9 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa

    private void updateDisplaySize() {
        mContext.getDisplay().getRealSize(mDisplaySize);
        if (DEBUG_MISSING_GESTURE) {
            Log.d(DEBUG_MISSING_GESTURE_TAG, "Update display size: mDisplaySize=" + mDisplaySize);
        }
        if (mEdgeBackPlugin != null) {
            mEdgeBackPlugin.setDisplaySize(mDisplaySize);
        }