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

Commit 808e2e29 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 

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

Change-Id: Iea643f7fa9f9fff4d9a73fe40b56dc5d6f180ee4
parents b6bb0424 b17c10f6

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} */