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

Merge "Move rotate button logging to Westworld" into rvc-dev am: 89fde50c8e am: 42ac88f5b8

Browse Source 
Change-Id: I2240ded356a526544a6773d01e348536ac10127c
This commit is contained in:
TreeHugger Robot
2020-05-18 23:03:04 +00:00
committed by Automerger Merge Worker
parent af14bbe0e0 42ac88f5b8
commit 036ba6e0e4
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationButtonController.java
View File

@@ -37,8 +37,9 @@ import android.view.View;
import android.view.WindowManagerGlobal; import android.view.WindowManagerGlobal;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEvent;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.UiEventLogger;
import com.android.internal.logging.UiEventLoggerImpl;
import com.android.systemui.Dependency; import com.android.systemui.Dependency;
import com.android.systemui.Interpolators; import com.android.systemui.Interpolators;
import com.android.systemui.R; import com.android.systemui.R;
@@ -60,7 +61,7 @@ public class RotationButtonController {
private static final int NUM_ACCEPTED_ROTATION_SUGGESTIONS_FOR_INTRODUCTION = 3; private static final int NUM_ACCEPTED_ROTATION_SUGGESTIONS_FOR_INTRODUCTION = 3;
private final MetricsLogger mMetricsLogger = Dependency.get(MetricsLogger.class); private final UiEventLogger mUiEventLogger = new UiEventLoggerImpl();
private final ViewRippler mViewRippler = new ViewRippler(); private final ViewRippler mViewRippler = new ViewRippler();
private @StyleRes int mStyleRes; private @StyleRes int mStyleRes;
@@ -323,7 +324,7 @@ public class RotationButtonController {
} }
private void onRotateSuggestionClick(View v) { private void onRotateSuggestionClick(View v) {
mMetricsLogger.action(MetricsEvent.ACTION_ROTATION_SUGGESTION_ACCEPTED); mUiEventLogger.log(RotationButtonEvent.ROTATION_SUGGESTION_ACCEPTED);
incrementNumAcceptedRotationSuggestionsIfNeeded(); incrementNumAcceptedRotationSuggestionsIfNeeded();
setRotationLockedAtAngle(mLastRotationSuggestion); setRotationLockedAtAngle(mLastRotationSuggestion);
} }
@@ -345,7 +346,7 @@ public class RotationButtonController {
private void showAndLogRotationSuggestion() { private void showAndLogRotationSuggestion() {
setRotateSuggestionButtonState(true /* visible */); setRotateSuggestionButtonState(true /* visible */);
rescheduleRotationTimeout(false /* reasonHover */); rescheduleRotationTimeout(false /* reasonHover */);
mMetricsLogger.visible(MetricsEvent.ROTATION_SUGGESTION_SHOWN); mUiEventLogger.log(RotationButtonEvent.ROTATION_SUGGESTION_SHOWN);
} }
private boolean shouldOverrideUserLockPrefs(final int rotation) { private boolean shouldOverrideUserLockPrefs(final int rotation) {
@@ -474,4 +475,19 @@ public class RotationButtonController {
} }
}; };
} }
enum RotationButtonEvent implements UiEventLogger.UiEventEnum {
@UiEvent(doc = "The rotation button was shown")
ROTATION_SUGGESTION_SHOWN(206),
@UiEvent(doc = "The rotation button was clicked")
ROTATION_SUGGESTION_ACCEPTED(207);
private final int mId;
RotationButtonEvent(int id) {
mId = id;
}
@Override public int getId() {
return mId;
}
}
} }