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

Merge "Migrate metrics logs to reflect new One-handed UI changes in Settings" into sc-dev am: 33f1797e56

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

Change-Id: I944264ff8037fc453deb2598a5fe0f26e38a2aaa
This commit is contained in:
Jason Chang
2021-06-25 03:30:22 +00:00
committed by Automerger Merge Worker
parent f78de30cf1 33f1797e56
commit 830ce11043
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,6 @@ public class OneHandedController implements RemoteCallable<OneHandedController>
private final OneHandedTouchHandler mTouchHandler;
private final OneHandedState mState;
private final OneHandedTutorialHandler mTutorialHandler;
private final OneHandedUiEventLogger mOneHandedUiEventLogger;
private final TaskStackListenerImpl mTaskStackListener;
private final IOverlayManager mOverlayManager;
private final ShellExecutor mMainExecutor;
@@ -105,6 +104,7 @@ public class OneHandedController implements RemoteCallable<OneHandedController>
private OneHandedEventCallback mEventCallback;
private OneHandedDisplayAreaOrganizer mDisplayAreaOrganizer;
private OneHandedBackgroundPanelOrganizer mBackgroundPanelOrganizer;
private OneHandedUiEventLogger mOneHandedUiEventLogger;
/**
* Handle rotation based on OnDisplayChangingListener callback
@@ -115,6 +115,8 @@ public class OneHandedController implements RemoteCallable<OneHandedController>
return;
}
mDisplayAreaOrganizer.onRotateDisplay(mContext, toRotation, wct);
mOneHandedUiEventLogger.writeEvent(
OneHandedUiEventLogger.EVENT_ONE_HANDED_TRIGGER_ROTATION_OUT);
};
private final DisplayController.OnDisplaysChangedListener mDisplaysChangedListener =
@@ -586,6 +588,10 @@ public class OneHandedController implements RemoteCallable<OneHandedController>
mContext.getContentResolver(), mUserId);
setSwipeToNotificationEnabled(enabled);
mOneHandedUiEventLogger.writeEvent(enabled
? OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_ON
: OneHandedUiEventLogger.EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_OFF);
// Also checks one handed mode settings since they all need gesture overlay.
setEnabledGesturalOverlay(
enabled || mOneHandedSettingsUtil.getSettingsOneHandedModeEnabled(

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

@@ -50,6 +50,8 @@ public class OneHandedUiEventLogger {
public static final int EVENT_ONE_HANDED_SETTINGS_TIMEOUT_SECONDS_4 = 15;
public static final int EVENT_ONE_HANDED_SETTINGS_TIMEOUT_SECONDS_8 = 16;
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;
private static final String[] EVENT_TAGS = {
"one_handed_trigger_gesture_in",
@@ -69,7 +71,9 @@ public class OneHandedUiEventLogger {
"one_handed_settings_timeout_seconds_never",
"one_handed_settings_timeout_seconds_4",
"one_handed_settings_timeout_seconds_8",
"one_handed_settings_timeout_seconds_12"
"one_handed_settings_timeout_seconds_12",
"one_handed_settings_show_notification_enabled_on",
"one_handed_settings_show_notification_enabled_off"
};
public OneHandedUiEventLogger(UiEventLogger uiEventLogger) {
@@ -152,7 +156,13 @@ public class OneHandedUiEventLogger {
ONE_HANDED_SETTINGS_TOGGLES_TIMEOUT_SECONDS_8(364),
@UiEvent(doc = "One-Handed mode timeout value changed to 12 seconds")
ONE_HANDED_SETTINGS_TOGGLES_TIMEOUT_SECONDS_12(365);
ONE_HANDED_SETTINGS_TOGGLES_TIMEOUT_SECONDS_12(365),
@UiEvent(doc = "One-Handed mode show notification toggle on")
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);
private final int mId;
@@ -247,6 +257,14 @@ public class OneHandedUiEventLogger {
mUiEventLogger.log(OneHandedSettingsTogglesEvent
.ONE_HANDED_SETTINGS_TOGGLES_TIMEOUT_SECONDS_12);
break;
case EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_ON:
mUiEventLogger.log(OneHandedSettingsTogglesEvent
.ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_ON);
break;
case EVENT_ONE_HANDED_SETTINGS_SHOW_NOTIFICATION_ENABLED_OFF:
mUiEventLogger.log(OneHandedSettingsTogglesEvent
.ONE_HANDED_SETTINGS_TOGGLES_SHOW_NOTIFICATION_ENABLED_OFF);
break;
default:
// Do nothing
break;