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

Merge "Remove last references to "Panic gesture"" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-18 14:03:46 +00:00
committed by Android (Google) Code Review
parent 483ba791b4 96e86b477e
commit 589035111a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/GestureLauncherService.java
View File

@@ -162,7 +162,7 @@ public class GestureLauncherService extends SystemService {
GESTURE_CAMERA_DOUBLE_TAP_POWER(660),
@UiEvent(doc = "The user multi-tapped power quickly enough to signal an emergency.")
GESTURE_PANIC_TAP_POWER(661);
GESTURE_EMERGENCY_TAP_POWER(661);
private final int mId;
@@ -508,7 +508,7 @@ public class GestureLauncherService extends SystemService {
} else if (launchEmergencyGesture) {
Slog.i(TAG, "Emergency gesture detected, launching.");
launchEmergencyGesture = handleEmergencyGesture();
mUiEventLogger.log(GestureLauncherEvent.GESTURE_PANIC_TAP_POWER);
mUiEventLogger.log(GestureLauncherEvent.GESTURE_EMERGENCY_TAP_POWER);
}
mMetricsLogger.histogram("power_consecutive_short_tap_count",
mPowerButtonSlowConsecutiveTaps);

4
services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java
View File

@@ -524,7 +524,7 @@ public class GestureLauncherServiceTest {
assertTrue(outLaunched.value);
verify(mUiEventLogger, times(1))
.log(GestureLauncherService.GestureLauncherEvent.GESTURE_PANIC_TAP_POWER);
.log(GestureLauncherService.GestureLauncherEvent.GESTURE_EMERGENCY_TAP_POWER);
verify(mStatusBarManagerInternal).onEmergencyActionLaunchGestureDetected();
final ArgumentCaptor<Integer> intervalCaptor = ArgumentCaptor.forClass(Integer.class);
@@ -578,7 +578,7 @@ public class GestureLauncherServiceTest {
assertTrue(intercepted);
verify(mUiEventLogger, times(1))
.log(GestureLauncherService.GestureLauncherEvent.GESTURE_PANIC_TAP_POWER);
.log(GestureLauncherService.GestureLauncherEvent.GESTURE_EMERGENCY_TAP_POWER);
verify(mStatusBarManagerInternal).onEmergencyActionLaunchGestureDetected();
final ArgumentCaptor<Integer> intervalCaptor = ArgumentCaptor.forClass(Integer.class);