[DO NOT MERGE] resolve merge conflicts of 079d81a4799a75e03a19148ed287e491142dd4c7 to qt-r1-dev (b1e83927) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -145,6 +145,7 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS =
		"assist_handles_shown_frequency_threshold_ms";

		// Flag related to clock face

		/**
		@@ -188,6 +189,11 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String ASSIST_TAP_PASSTHROUGH = "assist_tap_passthrough";

		/**
		* (bool) Whether to show handles when taught.
		*/
		public static final String ASSIST_HANDLES_SHOW_WHEN_TAUGHT = "assist_handles_show_when_taught";

		/**
		* (bool) Whether to use the new BrightLineFalsingManager.
		*/

packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ final class AssistHandleReminderExpBehavior implements BehaviorController {
		private static final boolean DEFAULT_SUPPRESS_ON_LOCKSCREEN = false;
		private static final boolean DEFAULT_SUPPRESS_ON_LAUNCHER = false;
		private static final boolean DEFAULT_SUPPRESS_ON_APPS = true;
		private static final boolean DEFAULT_SHOW_WHEN_TAUGHT = false;

		private static final String[] DEFAULT_HOME_CHANGE_ACTIONS = new String[] {
		PackageManagerWrapper.ACTION_PREFERRED_ACTIVITY_CHANGED,
		@@ -309,7 +310,7 @@ final class AssistHandleReminderExpBehavior implements BehaviorController {
		return;
		}

		if (mIsDozing \|\| mIsNavBarHidden \|\| mOnLockscreen) {
		if (mIsDozing \|\| mIsNavBarHidden \|\| mOnLockscreen \|\| !getShowWhenTaught()) {
		mAssistHandleCallbacks.hide();
		} else if (justUnlocked) {
		long currentEpochDay = LocalDate.now().toEpochDay();
		@@ -429,6 +430,12 @@ final class AssistHandleReminderExpBehavior implements BehaviorController {
		DEFAULT_SUPPRESS_ON_APPS);
		}

		private boolean getShowWhenTaught() {
		return mPhenotypeHelper.getBoolean(
		SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_WHEN_TAUGHT,
		DEFAULT_SHOW_WHEN_TAUGHT);
		}

		@Override
		public void dump(PrintWriter pw, String prefix) {
		pw.println(prefix + "Current AssistHandleReminderExpBehavior State:");
		@@ -480,5 +487,9 @@ final class AssistHandleReminderExpBehavior implements BehaviorController {
		+ SystemUiDeviceConfigFlags.ASSIST_HANDLES_SUPPRESS_ON_APPS
		+ "="
		+ getSuppressOnApps());
		pw.println(prefix + " "
		+ SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_WHEN_TAUGHT
		+ "="
		+ getShowWhenTaught());
		}
		}