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

[DO NOT MERGE] resolve merge conflicts of 079d81a479 to qt-r1-dev

Browse Source 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I11600ca3dafeb2d33d6b136895516ce52fdc7f6b
This commit is contained in:
Govinda Wasserman
2019-06-26 15:33:57 -04:00
parent 08fcdd9877 079d81a479
commit 8803dd60e4
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,6 +145,7 @@ public final class SystemUiDeviceConfigFlags {
*/ */
public static final String ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS = public static final String ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS =
"assist_handles_shown_frequency_threshold_ms"; "assist_handles_shown_frequency_threshold_ms";
// Flag related to clock face // Flag related to clock face
/** /**
@@ -187,7 +188,12 @@ public final class SystemUiDeviceConfigFlags {
* Allow touch passthrough above assist area during a session. * Allow touch passthrough above assist area during a session.
*/ */
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());
} }
} }