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

Commit bfa4337c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make quickPickup gesture depend on liftToWake" into sc-v2-dev am: b17c10f6 am: 808e2e29 

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

Change-Id: I0c56dd46512237340fa58afd149155ecfb97ce7b
parents 69700e2f 808e2e29

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

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


    /** {@hide} */

    public boolean quickPickupSensorEnabled(int user) {

        return !TextUtils.isEmpty(quickPickupSensorType()) && !alwaysOnEnabled(user);

        return !TextUtils.isEmpty(quickPickupSensorType())

                && pickupGestureEnabled(user)

                && !alwaysOnEnabled(user);

    }



    /** {@hide} */