Merge "Updating SysUI state when back enabled/disabled state change" into rvc-dev (d71e76fd) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -121,6 +121,8 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa

		private final Context mContext;
		private final OverviewProxyService mOverviewProxyService;
		private final Runnable mStateChangeCallback;

		private final PluginManager mPluginManager;
		// Activities which should not trigger Back gesture.
		private final List<ComponentName> mGestureBlockingActivities = new ArrayList<>();
		@@ -196,13 +198,15 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
		};

		public EdgeBackGestureHandler(Context context, OverviewProxyService overviewProxyService,
		SysUiState sysUiFlagContainer, PluginManager pluginManager) {
		SysUiState sysUiFlagContainer, PluginManager pluginManager,
		Runnable stateChangeCallback) {
		super(Dependency.get(BroadcastDispatcher.class));
		mContext = context;
		mDisplayId = context.getDisplayId();
		mMainExecutor = context.getMainExecutor();
		mOverviewProxyService = overviewProxyService;
		mPluginManager = pluginManager;
		mStateChangeCallback = stateChangeCallback;
		ComponentName recentsComponentName = ComponentName.unflattenFromString(
		context.getString(com.android.internal.R.string.config_recentsComponentName));
		if (recentsComponentName != null) {
		@@ -226,13 +230,13 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
		Log.e(TAG, "Failed to add gesture blocking activities", e);
		}
		}
		Dependency.get(ProtoTracer.class).add(this);

		Dependency.get(ProtoTracer.class).add(this);
		mLongPressTimeout = Math.min(MAX_LONG_PRESS_TIMEOUT,
		ViewConfiguration.getLongPressTimeout());

		mGestureNavigationSettingsObserver = new GestureNavigationSettingsObserver(
		mContext.getMainThreadHandler(), mContext, this::updateCurrentUserResources);
		mContext.getMainThreadHandler(), mContext, this::onNavigationSettingsChanged);

		updateCurrentUserResources();
		sysUiFlagContainer.addCallback(sysUiFlags -> mSysUiFlags = sysUiFlags);
		@@ -263,6 +267,14 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
		mTouchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop() * backGestureSlop;
		}

		private void onNavigationSettingsChanged() {
		boolean wasBackAllowed = isHandlingGestures();
		updateCurrentUserResources();
		if (wasBackAllowed != isHandlingGestures()) {
		mStateChangeCallback.run();
		}
		}

		@Override
		public void onUserSwitched(int newUserId) {
		updateIsEnabled();

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -326,8 +326,8 @@ public class NavigationBarView extends FrameLayout implements

		mNavColorSampleMargin = getResources()
		.getDimensionPixelSize(R.dimen.navigation_handle_sample_horizontal_margin);
		mEdgeBackGestureHandler = new EdgeBackGestureHandler(
		context, mOverviewProxyService, mSysUiFlagContainer, mPluginManager);
		mEdgeBackGestureHandler = new EdgeBackGestureHandler(context, mOverviewProxyService,
		mSysUiFlagContainer, mPluginManager, this::updateStates);
		mRegionSamplingHelper = new RegionSamplingHelper(this,
		new RegionSamplingHelper.SamplingCallback() {
		@Override