Merge "Fix typo TOLERENCE --> TOLERANCE" am: aefe92f478 am: 9a1634a944
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2407716 Change-Id: I559930d33986ffe298c6d549f86b2f739418ccea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -185,7 +185,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;
|
||||||
@@ -1423,7 +1423,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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user