Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add handle suppression to learned state" into qt-r1-dev-plus-aosp

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-26 00:15:06 +00:00
committed by Android (Google) Code Review
parent 6094927ad1 186794edb9
commit cac81a5c18
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
View File

@@ -195,6 +195,11 @@ public final class SystemUiDeviceConfigFlags {
*/ */
public static final String ASSIST_TAP_PASSTHROUGH = "assist_tap_passthrough"; 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. * (bool) Whether to use the new BrightLineFalsingManager.
*/ */

13
packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java
View File

@@ -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());
} }
} }