Merge "Honor per-user setting for assist gesture and long-press home" into sc-dev (49a91f2b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -231,7 +231,8 @@ public class DependencyProvider {
		@Main Handler mainHandler,
		UiEventLogger uiEventLogger,
		NavigationBarOverlayController navBarOverlayController,
		ConfigurationController configurationController) {
		ConfigurationController configurationController,
		UserTracker userTracker) {
		return new NavigationBarController(context,
		windowManager,
		assistManagerLazy,
		@@ -256,7 +257,8 @@ public class DependencyProvider {
		mainHandler,
		uiEventLogger,
		navBarOverlayController,
		configurationController);
		configurationController,
		userTracker);
		}

		/** */

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

+11 −5

Original line number	Diff line number	Diff line
		@@ -129,6 +129,7 @@ import com.android.systemui.plugins.DarkIconDispatcher;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.recents.OverviewProxyService;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.QuickStepContract;
		import com.android.systemui.statusbar.AutoHideUiElement;
		@@ -199,6 +200,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
		private final Handler mHandler;
		private final NavigationBarOverlayController mNavbarOverlayController;
		private final UiEventLogger mUiEventLogger;
		private final UserTracker mUserTracker;

		private Bundle mSavedState;
		private NavigationBarView mNavigationBarView;
		@@ -459,7 +461,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
		SystemActions systemActions,
		@Main Handler mainHandler,
		NavigationBarOverlayController navbarOverlayController,
		UiEventLogger uiEventLogger) {
		UiEventLogger uiEventLogger,
		UserTracker userTracker) {
		mContext = context;
		mWindowManager = windowManager;
		mAccessibilityManager = accessibilityManager;
		@@ -484,6 +487,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
		mHandler = mainHandler;
		mNavbarOverlayController = navbarOverlayController;
		mUiEventLogger = uiEventLogger;
		mUserTracker = userTracker;

		mNavBarMode = mNavigationModeController.addListener(this);
		mAccessibilityButtonModeObserver.addListener(this);
		@@ -1450,12 +1454,14 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
		.getAssistInfoForUser(UserHandle.USER_CURRENT) != null;
		boolean longPressDefault = mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_assistLongPressHomeEnabledDefault);
		mLongPressHomeEnabled = Settings.Secure.getInt(mContentResolver,
		Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0) != 0;
		mLongPressHomeEnabled = Settings.Secure.getIntForUser(mContentResolver,
		Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0,
		mUserTracker.getUserId()) != 0;
		boolean gestureDefault = mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_assistTouchGestureEnabledDefault);
		mAssistantTouchGestureEnabled = Settings.Secure.getInt(mContentResolver,
		Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, gestureDefault ? 1 : 0) != 0;
		mAssistantTouchGestureEnabled = Settings.Secure.getIntForUser(mContentResolver,
		Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, gestureDefault ? 1 : 0,
		mUserTracker.getUserId()) != 0;
		if (mOverviewProxyService.getProxy() != null) {
		try {
		mOverviewProxyService.getProxy().onAssistantAvailable(mAssistantAvailable

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ import com.android.systemui.model.SysUiState;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.recents.OverviewProxyService;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.CommandQueue.Callbacks;
		import com.android.systemui.statusbar.NotificationRemoteInputManager;
		@@ -116,6 +117,7 @@ public class NavigationBarController implements Callbacks,
		private final TaskbarDelegate mTaskbarDelegate;
		private int mNavMode;
		private boolean mIsTablet;
		private final UserTracker mUserTracker;

		/** A displayId - nav bar maps. */
		@VisibleForTesting
		@@ -151,7 +153,8 @@ public class NavigationBarController implements Callbacks,
		@Main Handler mainHandler,
		UiEventLogger uiEventLogger,
		NavigationBarOverlayController navBarOverlayController,
		ConfigurationController configurationController) {
		ConfigurationController configurationController,
		UserTracker userTracker) {
		mContext = context;
		mWindowManager = windowManager;
		mAssistManagerLazy = assistManagerLazy;
		@@ -184,6 +187,7 @@ public class NavigationBarController implements Callbacks,
		mNavigationModeController.addListener(this);
		mTaskbarDelegate = new TaskbarDelegate(mOverviewProxyService);
		mIsTablet = isTablet(mContext.getResources().getConfiguration());
		mUserTracker = userTracker;
		}

		@Override
		@@ -361,7 +365,8 @@ public class NavigationBarController implements Callbacks,
		mSystemActions,
		mHandler,
		mNavBarOverlayController,
		mUiEventLogger);
		mUiEventLogger,
		mUserTracker);
		mNavigationBars.put(displayId, navBar);

		View navigationBarView = navBar.createView(savedState);

packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ import com.android.systemui.model.SysUiState;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.recents.OverviewProxyService;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.NotificationRemoteInputManager;
		import com.android.systemui.statusbar.phone.ShadeController;
		@@ -108,7 +109,8 @@ public class NavigationBarControllerTest extends SysuiTestCase {
		Dependency.get(Dependency.MAIN_HANDLER),
		mock(UiEventLogger.class),
		mock(NavigationBarOverlayController.class),
		mock(ConfigurationController.class)));
		mock(ConfigurationController.class),
		mock(UserTracker.class)));
		initializeNavigationBars();
		}

packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.recents.OverviewProxyService;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.NotificationRemoteInputManager;
		import com.android.systemui.statusbar.phone.ShadeController;
		@@ -276,7 +277,8 @@ public class NavigationBarTest extends SysuiTestCase {
		mock(SystemActions.class),
		mHandler,
		mock(NavigationBarOverlayController.class),
		mUiEventLogger));
		mUiEventLogger,
		mock(UserTracker.class)));
		}

		private void processAllMessages() {