Merge "Improve SystemUIBootiming_StartServices_avg" into sc-dev (1334cfb9) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java

+1 −52

Original line number	Diff line number	Diff line
		@@ -140,8 +140,6 @@ public class OneHandedController implements RemoteCallable<OneHandedController>

		private final ContentObserver mActivatedObserver;
		private final ContentObserver mEnabledObserver;
		private final ContentObserver mTimeoutObserver;
		private final ContentObserver mTaskChangeExitObserver;
		private final ContentObserver mSwipeToNotificationEnabledObserver;
		private final ContentObserver mShortcutEnabledObserver;

		@@ -292,8 +290,6 @@ public class OneHandedController implements RemoteCallable<OneHandedController>

		mActivatedObserver = getObserver(this::onActivatedActionChanged);
		mEnabledObserver = getObserver(this::onEnabledSettingChanged);
		mTimeoutObserver = getObserver(this::onTimeoutSettingChanged);
		mTaskChangeExitObserver = getObserver(this::onTaskChangeExitSettingChanged);
		mSwipeToNotificationEnabledObserver =
		getObserver(this::onSwipeToNotificationEnabledChanged);
		mShortcutEnabledObserver = getObserver(this::onShortcutEnabledChanged);
		@@ -440,10 +436,6 @@ public class OneHandedController implements RemoteCallable<OneHandedController>
		mContext.getContentResolver(), mActivatedObserver, newUserId);
		mOneHandedSettingsUtil.registerSettingsKeyObserver(Settings.Secure.ONE_HANDED_MODE_ENABLED,
		mContext.getContentResolver(), mEnabledObserver, newUserId);
		mOneHandedSettingsUtil.registerSettingsKeyObserver(Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
		mContext.getContentResolver(), mTimeoutObserver, newUserId);
		mOneHandedSettingsUtil.registerSettingsKeyObserver(Settings.Secure.TAPS_APP_TO_EXIT,
		mContext.getContentResolver(), mTaskChangeExitObserver, newUserId);
		mOneHandedSettingsUtil.registerSettingsKeyObserver(
		Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED,
		mContext.getContentResolver(), mSwipeToNotificationEnabledObserver, newUserId);
		@@ -455,10 +447,6 @@ public class OneHandedController implements RemoteCallable<OneHandedController>
		private void unregisterSettingObservers() {
		mOneHandedSettingsUtil.unregisterSettingsKeyObserver(mContext.getContentResolver(),
		mEnabledObserver);
		mOneHandedSettingsUtil.unregisterSettingsKeyObserver(mContext.getContentResolver(),
		mTimeoutObserver);
		mOneHandedSettingsUtil.unregisterSettingsKeyObserver(mContext.getContentResolver(),
		mTaskChangeExitObserver);
		mOneHandedSettingsUtil.unregisterSettingsKeyObserver(mContext.getContentResolver(),
		mSwipeToNotificationEnabledObserver);
		mOneHandedSettingsUtil.unregisterSettingsKeyObserver(mContext.getContentResolver(),
		@@ -474,6 +462,7 @@ public class OneHandedController implements RemoteCallable<OneHandedController>
		.getSettingsTapsAppToExit(mContext.getContentResolver(), mUserId));
		setSwipeToNotificationEnabled(mOneHandedSettingsUtil
		.getSettingsSwipeToNotificationEnabled(mContext.getContentResolver(), mUserId));
		onShortcutEnabledChanged();
		}

		private void updateDisplayLayout(int displayId) {
		@@ -546,46 +535,6 @@ public class OneHandedController implements RemoteCallable<OneHandedController>
		mContext.getContentResolver(), mUserId), true /* DelayExecute */);
		}

		@VisibleForTesting
		void onTimeoutSettingChanged() {
		final int newTimeout = mOneHandedSettingsUtil.getSettingsOneHandedModeTimeout(
		mContext.getContentResolver(), mUserId);
		int metricsId = OneHandedUiEventLogger.OneHandedSettingsTogglesEvent.INVALID.getId();
		switch (newTimeout) {
		case OneHandedSettingsUtil.ONE_HANDED_TIMEOUT_NEVER:
		metricsId = OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_TIMEOUT_SECONDS_NEVER;
		break;
		case OneHandedSettingsUtil.ONE_HANDED_TIMEOUT_SHORT_IN_SECONDS:
		metricsId = OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_TIMEOUT_SECONDS_4;
		break;
		case OneHandedSettingsUtil.ONE_HANDED_TIMEOUT_MEDIUM_IN_SECONDS:
		metricsId = OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_TIMEOUT_SECONDS_8;
		break;
		case OneHandedSettingsUtil.ONE_HANDED_TIMEOUT_LONG_IN_SECONDS:
		metricsId = OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_TIMEOUT_SECONDS_12;
		break;
		default:
		// do nothing
		break;
		}
		mOneHandedUiEventLogger.writeEvent(metricsId);

		if (mTimeoutHandler != null) {
		mTimeoutHandler.setTimeout(newTimeout);
		}
		}

		@VisibleForTesting
		void onTaskChangeExitSettingChanged() {
		final boolean enabled = mOneHandedSettingsUtil.getSettingsTapsAppToExit(
		mContext.getContentResolver(), mUserId);
		mOneHandedUiEventLogger.writeEvent(enabled
		? OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_APP_TAPS_EXIT_ON
		: OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_APP_TAPS_EXIT_OFF);

		setTaskChangeToExit(enabled);
		}

		@VisibleForTesting
		void onSwipeToNotificationEnabledChanged() {
		final boolean enabled =

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedControllerTest.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -237,13 +237,6 @@ public class OneHandedControllerTest extends OneHandedTestCase {
		verify(mSpiedOneHandedController).setOneHandedEnabled(anyBoolean());
		}

		@Test
		public void testSettingsObserverUpdateTimeout() {
		mSpiedOneHandedController.onTimeoutSettingChanged();

		verify(mSpiedTimeoutHandler, atLeastOnce()).setTimeout(anyInt());
		}

		@Test
		public void testSettingsObserverUpdateSwipeToNotification() {
		mSpiedOneHandedController.onSwipeToNotificationEnabledChanged();