diff options
| -rw-r--r-- | core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java | 6 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java b/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java index 4786d41fef4b..0e703fa686e0 100644 --- a/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java +++ b/core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java @@ -26,6 +26,7 @@ import android.os.Handler; import android.os.UserHandle; import android.provider.DeviceConfig; import android.provider.Settings; +import android.util.DisplayMetrics; import android.util.TypedValue; /** @@ -99,12 +100,13 @@ public class GestureNavigationSettingsObserver extends ContentObserver { } private int getSensitivity(Resources userRes, String side) { + final DisplayMetrics dm = userRes.getDisplayMetrics(); final float defaultInset = userRes.getDimension( - com.android.internal.R.dimen.config_backGestureInset); + com.android.internal.R.dimen.config_backGestureInset) / dm.density; final float backGestureInset = DeviceConfig.getFloat(DeviceConfig.NAMESPACE_SYSTEMUI, BACK_GESTURE_EDGE_WIDTH, defaultInset); final float inset = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, backGestureInset, - userRes.getDisplayMetrics()); + dm); final float scale = Settings.Secure.getFloatForUser( mContext.getContentResolver(), side, 1.0f, UserHandle.USER_CURRENT); return (int) (inset * scale); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java index 6748e3f76771..0e8c1b78ae6a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java @@ -36,6 +36,7 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.provider.DeviceConfig; import android.provider.Settings; +import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; import android.view.ISystemGestureExclusionListener; @@ -232,13 +233,14 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa mIsBackGestureAllowed = !mGestureNavigationSettingsObserver.areNavigationButtonForcedVisible(); + final DisplayMetrics dm = res.getDisplayMetrics(); final float defaultGestureHeight = res.getDimension( - com.android.internal.R.dimen.navigation_bar_gesture_height); + com.android.internal.R.dimen.navigation_bar_gesture_height) / dm.density; final float gestureHeight = DeviceConfig.getFloat(DeviceConfig.NAMESPACE_SYSTEMUI, SystemUiDeviceConfigFlags.BACK_GESTURE_BOTTOM_HEIGHT, defaultGestureHeight); - mBottomGestureHeight = TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, gestureHeight, res.getDisplayMetrics()); + mBottomGestureHeight = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, gestureHeight, + dm); // Reduce the default touch slop to ensure that we can intercept the gesture // before the app starts to react to it. |