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

Commit 7b6a48ce authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Account for getDimension() also doing a pixel conversion" into rvc-dev am: a29ccb6f 

Change-Id: If2880b5676fd62afe5c140f88733f74f09cced8e
parents f28d4005 a29ccb6f

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

+4 −2
Original line number Diff line number Diff line
@@ -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);

packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java

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