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

Merge "Only apply back gesture device config if there are existing insets" into rvc-d1-dev am: f7a4faa241

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12272603

Change-Id: Id6d570a78ed4e9d057fffe5f15b75234b2c2f4c1
This commit is contained in:
Winson Chung
2020-07-31 16:53:06 +00:00
committed by Automerger Merge Worker
parent 66909a0d5d f7a4faa241
commit 9205f447b5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java
View File

@@ -103,8 +103,11 @@ public class GestureNavigationSettingsObserver extends ContentObserver {
final DisplayMetrics dm = userRes.getDisplayMetrics(); final DisplayMetrics dm = userRes.getDisplayMetrics();
final float defaultInset = userRes.getDimension( final float defaultInset = userRes.getDimension(
com.android.internal.R.dimen.config_backGestureInset) / dm.density; com.android.internal.R.dimen.config_backGestureInset) / dm.density;
final float backGestureInset = DeviceConfig.getFloat(DeviceConfig.NAMESPACE_SYSTEMUI, // Only apply the back gesture config if there is an existing inset
BACK_GESTURE_EDGE_WIDTH, defaultInset); 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, final float inset = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, backGestureInset,
dm); dm);
final float scale = Settings.Secure.getFloatForUser( final float scale = Settings.Secure.getFloatForUser(