Merge "Fix typo TOLERENCE --> TOLERANCE" am: aefe92f478

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

Change-Id: I687a2b422d7a17f75f914d92f92386dca7e45eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Chang
2023-01-31 19:51:21 +00:00
committed by Automerger Merge Worker

View File

@@ -183,7 +183,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
private static final String EXTRA_TRANSIENT_STATE = "transient_state"; private static final String EXTRA_TRANSIENT_STATE = "transient_state";
/** Allow some time inbetween the long press for back and recents. */ /** Allow some time inbetween the long press for back and recents. */
private static final int LOCK_TO_APP_GESTURE_TOLERENCE = 200; private static final int LOCK_TO_APP_GESTURE_TOLERANCE = 200;
private static final long AUTODIM_TIMEOUT_MS = 2250; private static final long AUTODIM_TIMEOUT_MS = 2250;
private final Context mContext; private final Context mContext;
@@ -1396,7 +1396,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
// If we recently long-pressed the other button then they were // If we recently long-pressed the other button then they were
// long-pressed 'together' // long-pressed 'together'
if ((time - mLastLockToAppLongPress) < LOCK_TO_APP_GESTURE_TOLERENCE) { if ((time - mLastLockToAppLongPress) < LOCK_TO_APP_GESTURE_TOLERANCE) {
stopLockTaskMode = true; stopLockTaskMode = true;
return true; return true;
} else if (v.getId() == btnId1) { } else if (v.getId() == btnId1) {