Merge "Add handle suppression to learned state" into qt-dev (079d81a4) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -176,6 +176,11 @@ public final class SystemUiDeviceConfigFlags {
	public static final String ASSIST_HANDLES_SUPPRESS_ON_APPS =		public static final String ASSIST_HANDLES_SUPPRESS_ON_APPS =
	"assist_handles_suppress_on_apps";		"assist_handles_suppress_on_apps";

			/**
			* (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.		* (bool) Whether to use the new BrightLineFalsingManager.
	*/		*/

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

+12 −1

Original line number	Original line	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_LOCKSCREEN = false;
	private static final boolean DEFAULT_SUPPRESS_ON_LAUNCHER = false;		private static final boolean DEFAULT_SUPPRESS_ON_LAUNCHER = false;
	private static final boolean DEFAULT_SUPPRESS_ON_APPS = true;		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[] {		private static final String[] DEFAULT_HOME_CHANGE_ACTIONS = new String[] {
	PackageManagerWrapper.ACTION_PREFERRED_ACTIVITY_CHANGED,		PackageManagerWrapper.ACTION_PREFERRED_ACTIVITY_CHANGED,
	@@ -309,7 +310,7 @@ final class AssistHandleReminderExpBehavior implements BehaviorController {
	return;		return;
	}		}

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

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

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