Merge "Add log to verify display change is called" into sc-dev

This commit is contained in:
Winson Chung
2021-04-09 03:06:42 +00:00
committed by Android (Google) Code Review

View File

@@ -415,6 +415,9 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
if (!mIsEnabled) { if (!mIsEnabled) {
mGestureNavigationSettingsObserver.unregister(); mGestureNavigationSettingsObserver.unregister();
mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this); mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this);
if (DEBUG_MISSING_GESTURE) {
Log.d(DEBUG_MISSING_GESTURE_TAG, "Unregister display listener");
}
mPluginManager.removePluginListener(this); mPluginManager.removePluginListener(this);
TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener); TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener);
DeviceConfig.removeOnPropertiesChangedListener(mOnPropertiesChangedListener); DeviceConfig.removeOnPropertiesChangedListener(mOnPropertiesChangedListener);
@@ -432,6 +435,9 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
updateDisplaySize(); updateDisplaySize();
mContext.getSystemService(DisplayManager.class).registerDisplayListener(this, mContext.getSystemService(DisplayManager.class).registerDisplayListener(this,
mContext.getMainThreadHandler()); mContext.getMainThreadHandler());
if (DEBUG_MISSING_GESTURE) {
Log.d(DEBUG_MISSING_GESTURE_TAG, "Register display listener");
}
TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackListener); TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackListener);
DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI, DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI,
runnable -> (mContext.getMainThreadHandler()).post(runnable), runnable -> (mContext.getMainThreadHandler()).post(runnable),
@@ -817,6 +823,10 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
updateDisabledForQuickstep(); updateDisabledForQuickstep();
} }
if (DEBUG_MISSING_GESTURE) {
Log.d(DEBUG_MISSING_GESTURE_TAG, "Display changed: mDisplayId=" + mDisplayId
+ " displayId=" + displayId);
}
if (displayId == mDisplayId) { if (displayId == mDisplayId) {
updateDisplaySize(); updateDisplaySize();
} }
@@ -824,6 +834,9 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
private void updateDisplaySize() { private void updateDisplaySize() {
mContext.getDisplay().getRealSize(mDisplaySize); mContext.getDisplay().getRealSize(mDisplaySize);
if (DEBUG_MISSING_GESTURE) {
Log.d(DEBUG_MISSING_GESTURE_TAG, "Update display size: mDisplaySize=" + mDisplaySize);
}
if (mEdgeBackPlugin != null) { if (mEdgeBackPlugin != null) {
mEdgeBackPlugin.setDisplaySize(mDisplaySize); mEdgeBackPlugin.setDisplaySize(mDisplaySize);
} }