Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8803dd60 authored by Govinda Wasserman's avatar Govinda Wasserman
Browse files

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

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I11600ca3dafeb2d33d6b136895516ce52fdc7f6b
parents 08fcdd98 079d81a4

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -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





    /**

    /**
@@ -188,6 +189,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.

     */

     */

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

    }

    }

}
 
}