diff options
| author | 2020-07-31 16:51:39 +0000 | |
|---|---|---|
| committer | 2020-07-31 16:51:39 +0000 | |
| commit | 57b3d2aa49e7c74c9f1afb09793cd02c5d481f1e (patch) | |
| tree | 1575a292c23fe68cfd4c459a75b09d55bff094ce | |
| parent | acbb11f541a4a844dc511b636ae2188a1bdc7ae2 (diff) | |
| parent | f7a4faa2410e8bcef76f3c3c6a7ed7dee3ef09b4 (diff) | |
Merge "Only apply back gesture device config if there are existing insets" into rvc-d1-dev am: f7a4faa241
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12272603
Change-Id: I60642aa24d0d3ac575b4d4b9dd9ac1441a32fd48
| -rw-r--r-- | core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java b/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java index 0e703fa686e0..205c5fd735ea 100644 --- a/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java +++ b/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java @@ -103,8 +103,11 @@ public class GestureNavigationSettingsObserver extends ContentObserver { final DisplayMetrics dm = userRes.getDisplayMetrics(); final float defaultInset = userRes.getDimension( com.android.internal.R.dimen.config_backGestureInset) / dm.density; - final float backGestureInset = DeviceConfig.getFloat(DeviceConfig.NAMESPACE_SYSTEMUI, - BACK_GESTURE_EDGE_WIDTH, defaultInset); + // Only apply the back gesture config if there is an existing inset + final float backGestureInset = defaultInset > 0 + ? DeviceConfig.getFloat(DeviceConfig.NAMESPACE_SYSTEMUI, + BACK_GESTURE_EDGE_WIDTH, defaultInset) + : defaultInset; final float inset = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, backGestureInset, dm); final float scale = Settings.Secure.getFloatForUser( |