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

Commit b17c10f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make quickPickup gesture depend on liftToWake" into sc-v2-dev

parents 8dfb06f1 5deab1f7

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