From 3aa4f362c10d94ff319491928ddb7e7c5364b0ed Mon Sep 17 00:00:00 2001 From: Govinda Wasserman Date: Wed, 19 Jun 2019 11:23:43 -0400 Subject: [PATCH] Add handle suppression to learned state Also adds a phenotype flag to enable handles in the learned state once per day. Test: Tested locally BUG:132983599 Change-Id: I21e422382e62ee098cd6ff76d6b764db98be0cb7 Merged-In: I21e422382e62ee098cd6ff76d6b764db98be0cb7 --- .../config/sysui/SystemUiDeviceConfigFlags.java | 5 +++++ .../assist/AssistHandleReminderExpBehavior.java | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java index 8b70bd61785a1..4daddfbfb2042 100644 --- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java +++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java @@ -176,6 +176,11 @@ public final class SystemUiDeviceConfigFlags { public static final String 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. */ diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java index 0af333e96edff..f9ddeaef3e86d 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java @@ -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()); } }