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

Commit 206ad5db authored by Jason Chang's avatar Jason Chang Committed by Automerger Merge Worker
Browse files

Merge "Add metrics log for One-handed mode Shortcut toggle switch" into sc-dev am: 56bb99d4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15207284

Change-Id: If2a40b20a577f56084854de918b3a1776e92247b
parents b51de11c 56bb99d4

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java

+4 −0
Original line number Diff line number Diff line
@@ -601,6 +601,10 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 
    void onShortcutEnabledChanged() {

        mIsShortcutEnabled = mOneHandedSettingsUtil.getShortcutEnabled(

                mContext.getContentResolver(), mUserId);



        mOneHandedUiEventLogger.writeEvent(mIsShortcutEnabled

                ? OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_ON

                : OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_OFF);

    }



    private void setupTimeoutListener() {

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedUiEventLogger.java

+20 −2
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ public class OneHandedUiEventLogger { 
    public static final int EVENT_ONE_HANDED_SETTINGS_TIMEOUT_SECONDS_12 = 17;

    public static final int EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_ON = 18;

    public static final int EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_OFF = 19;

    public static final int EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_ON = 20;

    public static final int EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_OFF = 21;



    private static final String[] EVENT_TAGS = {

            "one_handed_trigger_gesture_in",
@@ -73,7 +75,9 @@ public class OneHandedUiEventLogger { 
            "one_handed_settings_timeout_seconds_8",

            "one_handed_settings_timeout_seconds_12",

            "one_handed_settings_show_notification_enabled_on",

            "one_handed_settings_show_notification_enabled_off"

            "one_handed_settings_show_notification_enabled_off",

            "one_handed_settings_shortcut_enabled_on",

            "one_handed_settings_shortcut_enabled_off"

    };



    public OneHandedUiEventLogger(UiEventLogger uiEventLogger) {
@@ -162,7 +166,13 @@ public class OneHandedUiEventLogger { 
        ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_ON(847),



        @UiEvent(doc = "One-Handed mode show notification toggle off")

        ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_OFF(848);

        ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_OFF(848),



        @UiEvent(doc = "One-Handed mode shortcut toggle on")

        ONE_HANDED_SETTINGS_TOGGLES_SHORTCUT_ENABLED_ON(870),



        @UiEvent(doc = "One-Handed mode shortcut toggle off")

        ONE_HANDED_SETTINGS_TOGGLES_SHORTCUT_ENABLED_OFF(871);



        private final int mId;
@@ -265,6 +275,14 @@ public class OneHandedUiEventLogger { 
                mUiEventLogger.log(OneHandedSettingsTogglesEvent

                        .ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_OFF);

                break;

            case EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_ON:

                mUiEventLogger.log(OneHandedSettingsTogglesEvent

                        .ONE_HANDED_SETTINGS_TOGGLES_SHORTCUT_ENABLED_ON);

                break;

            case EVENT_ONE_HANDED_SETTINGS_SHORTCUT_ENABLED_OFF:

                mUiEventLogger.log(OneHandedSettingsTogglesEvent

                        .ONE_HANDED_SETTINGS_TOGGLES_SHORTCUT_ENABLED_OFF);

                break;

            default:

                // Do nothing

                break;