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

Commit 2aa469fe authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Checking Settings config for quick pick-up gesture" into sc-v2-dev am: fcfd7e1a 

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

Change-Id: Ie09ce22aa73f89d1580542dfa4335be29de14b47
parents 9e30939b fcfd7e1a

core/java/android/hardware/display/AmbientDisplayConfiguration.java

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ public class AmbientDisplayConfiguration { 


    /** {@hide} */

    public boolean quickPickupSensorEnabled(int user) {

        return !TextUtils.isEmpty(quickPickupSensorType())

        return boolSettingDefaultOn(Settings.Secure.DOZE_QUICK_PICKUP_GESTURE, user)

                && !TextUtils.isEmpty(quickPickupSensorType())

                && pickupGestureEnabled(user)

                && !alwaysOnEnabled(user);

    }