Merge "Fix back gesture not enabled in 3-button mode on fresh boot" into udc-qpr-dev (72ed444d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+75 −75

Original line number	Original line	Diff line number	Diff line
	@@ -254,8 +254,9 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	private boolean mDeferSetIsOnLeftEdge;		private boolean mDeferSetIsOnLeftEdge;

	private boolean mIsAttached;		private boolean mIsAttached;
	private boolean mIsGesturalModeEnabled;		private boolean mIsGestureHandlingEnabled;
	private boolean mIsTrackpadConnected;		private boolean mIsTrackpadConnected;
			private boolean mInGestureNavMode;
	private boolean mUsingThreeButtonNav;		private boolean mUsingThreeButtonNav;
	private boolean mIsEnabled;		private boolean mIsEnabled;
	private boolean mIsNavBarShownTransiently;		private boolean mIsNavBarShownTransiently;
	@@ -562,9 +563,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	mInputManager.registerInputDeviceListener(mInputDeviceListener, mMainHandler);		mInputManager.registerInputDeviceListener(mInputDeviceListener, mMainHandler);
	int [] inputDevices = mInputManager.getInputDeviceIds();		int [] inputDevices = mInputManager.getInputDeviceIds();
	for (int inputDeviceId : inputDevices) {		for (int inputDeviceId : inputDevices) {
	if (isTrackpadDevice(inputDeviceId)) {		mInputDeviceListener.onInputDeviceAdded(inputDeviceId);
	mIsTrackpadConnected = true;
	}
	}		}
	}		}
	updateIsEnabled();		updateIsEnabled();
	@@ -589,8 +588,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	*/		*/
	public void onNavigationModeChanged(int mode) {		public void onNavigationModeChanged(int mode) {
	mUsingThreeButtonNav = QuickStepContract.isLegacyMode(mode);		mUsingThreeButtonNav = QuickStepContract.isLegacyMode(mode);
	mIsGesturalModeEnabled = QuickStepContract.isGesturalMode(mode) \|\| (		mInGestureNavMode = QuickStepContract.isGesturalMode(mode);
	mIsTrackpadGestureFeaturesEnabled && mUsingThreeButtonNav && mIsTrackpadConnected);
	updateIsEnabled();		updateIsEnabled();
	updateCurrentUserResources();		updateCurrentUserResources();
	}		}
	@@ -613,14 +611,11 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	private void updateIsEnabled() {		private void updateIsEnabled() {
	try {		try {
	Trace.beginSection("EdgeBackGestureHandler#updateIsEnabled");		Trace.beginSection("EdgeBackGestureHandler#updateIsEnabled");
	updateIsEnabledTraced();
	} finally {
	Trace.endSection();
	}
	}

	private void updateIsEnabledTraced() {		mIsGestureHandlingEnabled =
	boolean isEnabled = mIsAttached && mIsGesturalModeEnabled;		mInGestureNavMode \|\| (mIsTrackpadGestureFeaturesEnabled && mUsingThreeButtonNav
			&& mIsTrackpadConnected);
			boolean isEnabled = mIsAttached && mIsGestureHandlingEnabled;
	if (isEnabled == mIsEnabled) {		if (isEnabled == mIsEnabled) {
	return;		return;
	}		}
	@@ -638,7 +633,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	Log.d(DEBUG_MISSING_GESTURE_TAG, "Unregister display listener");		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);
	mPipOptional.ifPresent(pip -> pip.setOnIsInPipStateChangedListener(null));		mPipOptional.ifPresent(pip -> pip.setOnIsInPipStateChangedListener(null));

	@@ -655,11 +651,12 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	if (DEBUG_MISSING_GESTURE) {		if (DEBUG_MISSING_GESTURE) {
	Log.d(DEBUG_MISSING_GESTURE_TAG, "Register display listener");		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,
	mMainExecutor::execute, mOnPropertiesChangedListener);		mMainExecutor::execute, mOnPropertiesChangedListener);
	mPipOptional.ifPresent(		mPipOptional.ifPresent(pip -> pip.setOnIsInPipStateChangedListener(
	pip -> pip.setOnIsInPipStateChangedListener(mOnIsInPipStateChangedListener));		mOnIsInPipStateChangedListener));
	mDesktopModeOptional.ifPresent(		mDesktopModeOptional.ifPresent(
	dm -> dm.addDesktopGestureExclusionRegionListener(		dm -> dm.addDesktopGestureExclusionRegionListener(
	mDesktopCornersChangedListener, mMainExecutor));		mDesktopCornersChangedListener, mMainExecutor));
	@@ -686,6 +683,9 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	}		}
	// Update the ML model resources.		// Update the ML model resources.
	updateMLModelState();		updateMLModelState();
			} finally {
			Trace.endSection();
			}
	}		}

	@Override		@Override
	@@ -762,8 +762,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	}		}

	private void updateMLModelState() {		private void updateMLModelState() {
	boolean newState =		boolean newState = mIsGestureHandlingEnabled && DeviceConfig.getBoolean(
	mIsGesturalModeEnabled && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,		DeviceConfig.NAMESPACE_SYSTEMUI,
	SystemUiDeviceConfigFlags.USE_BACK_GESTURE_ML_MODEL, false);		SystemUiDeviceConfigFlags.USE_BACK_GESTURE_ML_MODEL, false);

	if (newState == mUseMLModel) {		if (newState == mUseMLModel) {
	@@ -1234,7 +1234,7 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
	pw.println(" mIsEnabled=" + mIsEnabled);		pw.println(" mIsEnabled=" + mIsEnabled);
	pw.println(" mIsAttached=" + mIsAttached);		pw.println(" mIsAttached=" + mIsAttached);
	pw.println(" mIsBackGestureAllowed=" + mIsBackGestureAllowed);		pw.println(" mIsBackGestureAllowed=" + mIsBackGestureAllowed);
	pw.println(" mIsGesturalModeEnabled=" + mIsGesturalModeEnabled);		pw.println(" mIsGestureHandlingEnabled=" + mIsGestureHandlingEnabled);
	pw.println(" mIsNavBarShownTransiently=" + mIsNavBarShownTransiently);		pw.println(" mIsNavBarShownTransiently=" + mIsNavBarShownTransiently);
	pw.println(" mGestureBlockingActivityRunning=" + mGestureBlockingActivityRunning);		pw.println(" mGestureBlockingActivityRunning=" + mGestureBlockingActivityRunning);
	pw.println(" mAllowGesture=" + mAllowGesture);		pw.println(" mAllowGesture=" + mAllowGesture);