Merge "Fix typo TOLERENCE --> TOLERANCE" am: aefe92f478 am: 9a1634a944 am: 46db7cdc32
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2407716 Change-Id: I90c3532e1aeaebc42a46cba4ce145efd01156258 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -191,7 +191,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
|
||||
private static final String EXTRA_TRANSIENT_STATE = "transient_state";
|
||||
|
||||
/** 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 final Context mContext;
|
||||
@@ -1439,7 +1439,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
|
||||
|
||||
// If we recently long-pressed the other button then they were
|
||||
// long-pressed 'together'
|
||||
if ((time - mLastLockToAppLongPress) < LOCK_TO_APP_GESTURE_TOLERENCE) {
|
||||
if ((time - mLastLockToAppLongPress) < LOCK_TO_APP_GESTURE_TOLERANCE) {
|
||||
stopLockTaskMode = true;
|
||||
return true;
|
||||
} else if (v.getId() == btnId1) {
|
||||
|
||||
Reference in New Issue
Block a user