Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 646b83f0 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Only apply back gesture device config if there are existing insets"... 

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

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

Change-Id: If3fdd3b1e6a428a8c2e790d5487ace71db467148
parents 69194793 57b3d2aa

core/java/com/android/internal/policy/GestureNavigationSettingsObserver.java

+5 −2
Original line number Diff line number Diff line
@@ -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(