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

Commit b02028fb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8223887, 8223888, 8223889, 8223890, 8227082, 8218568,... 

Merge cherrypicks of [8223887, 8223888, 8223889, 8223890, 8227082, 8218568, 8218569, 8218570, 8215306, 8227083, 8227084, 8227085, 8227086, 8227087, 8218416, 8218417, 8228838, 8228839, 8223891, 8228840, 8223892, 8223893, 8227088] into qt-c2f2-release

Change-Id: I0f12e79254bc9ff9f0ca1471fe7a667ec4898f96
parents f5ec0ffa 616c25b7

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

+10 −3
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ public class AmbientDisplayConfiguration { 
        return pulseOnNotificationEnabled(user)

                || pulseOnLongPressEnabled(user)

                || alwaysOnEnabled(user)

                || wakeScreenGestureEnabled(user)

                || wakeLockScreenGestureEnabled(user)

                || wakeDisplayGestureEnabled(user)

                || pickupGestureEnabled(user)

                || tapGestureEnabled(user)

                || doubleTapGestureEnabled(user);
@@ -105,8 +106,14 @@ public class AmbientDisplayConfiguration { 
    }



    /** {@hide} */

    public boolean wakeScreenGestureEnabled(int user) {

        return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_SCREEN_GESTURE, user)

    public boolean wakeLockScreenGestureEnabled(int user) {

        return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE, user)

                && wakeScreenGestureAvailable();

    }



    /** {@hide} */

    public boolean wakeDisplayGestureEnabled(int user) {

        return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE, user)

                && wakeScreenGestureAvailable();

    }

core/java/android/provider/Settings.java

+18 −6
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ import android.util.ArrayMap; 
import android.util.ArraySet;

import android.util.Log;

import android.util.MemoryIntArray;

import android.view.Display;

import android.view.inputmethod.InputMethodSystemProperty;















import com.android.internal.annotations.GuardedBy;










@@ -4073,7 +4074,7 @@ public final class Settings {













         * preference, this rotation value will be used. Must be one of the















         * {@link android.view.Surface#ROTATION_0 Surface rotation constants}.















         *













         * @see android.view.Display#getRotation













         * @see Display#getRotation















         */















        public static final String USER_ROTATION = "user_rotation";
























@@ -7733,12 +7734,21 @@ public final class Settings {













        private static final Validator DOZE_TAP_SCREEN_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;





























        /**













         * Gesture that wakes up the display, showing the ambient version of the status bar.













         * Gesture that wakes up the display, showing some version of the lock screen.















         * @hide















         */













        public static final String DOZE_WAKE_SCREEN_GESTURE = "doze_wake_screen_gesture";













        public static final String DOZE_WAKE_LOCK_SCREEN_GESTURE = "doze_wake_screen_gesture";



























        private static final Validator DOZE_WAKE_SCREEN_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;













        private static final Validator DOZE_WAKE_LOCK_SCREEN_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;

























        /**













         * Gesture that wakes up the display, toggling between {@link Display.STATE_OFF} and













         * {@link Display.STATE_DOZE}.













         * @hide













         */













        public static final String DOZE_WAKE_DISPLAY_GESTURE = "doze_wake_display_gesture";

























        private static final Validator DOZE_WAKE_DISPLAY_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;





























        /**















         * Gesture that skips media.










@@ -8964,7 +8974,8 @@ public final class Settings {













            DOZE_PICK_UP_GESTURE,















            DOZE_DOUBLE_TAP_GESTURE,















            DOZE_TAP_SCREEN_GESTURE,













            DOZE_WAKE_SCREEN_GESTURE,













            DOZE_WAKE_LOCK_SCREEN_GESTURE,













            DOZE_WAKE_DISPLAY_GESTURE,















            NFC_PAYMENT_DEFAULT_COMPONENT,















            AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,















            FACE_UNLOCK_KEYGUARD_ENABLED,










@@ -9136,7 +9147,8 @@ public final class Settings {













            VALIDATORS.put(DOZE_PICK_UP_GESTURE, DOZE_PICK_UP_GESTURE_VALIDATOR);















            VALIDATORS.put(DOZE_DOUBLE_TAP_GESTURE, DOZE_DOUBLE_TAP_GESTURE_VALIDATOR);















            VALIDATORS.put(DOZE_TAP_SCREEN_GESTURE, DOZE_TAP_SCREEN_GESTURE_VALIDATOR);













            VALIDATORS.put(DOZE_WAKE_SCREEN_GESTURE, DOZE_WAKE_SCREEN_GESTURE_VALIDATOR);













            VALIDATORS.put(DOZE_WAKE_LOCK_SCREEN_GESTURE, DOZE_WAKE_LOCK_SCREEN_GESTURE_VALIDATOR);













            VALIDATORS.put(DOZE_WAKE_DISPLAY_GESTURE, DOZE_WAKE_DISPLAY_GESTURE_VALIDATOR);















            VALIDATORS.put(NFC_PAYMENT_DEFAULT_COMPONENT, NFC_PAYMENT_DEFAULT_COMPONENT_VALIDATOR);















            VALIDATORS.put(AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,















                    AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_VALIDATOR);

































packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -127,15 +127,15 @@ public class DozeSensors {













                        true /* touchscreen */),















                new PluginSensor(















                        new SensorManagerPlugin.Sensor(TYPE_WAKE_DISPLAY),













                        Settings.Secure.DOZE_WAKE_SCREEN_GESTURE,













                        Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,















                        mConfig.wakeScreenGestureAvailable() && alwaysOn,















                        DozeLog.REASON_SENSOR_WAKE_UP,















                        false /* reports touch coordinates */,















                        false /* touchscreen */),















                new PluginSensor(















                        new SensorManagerPlugin.Sensor(TYPE_WAKE_LOCK_SCREEN),













                        Settings.Secure.DOZE_WAKE_SCREEN_GESTURE,













                        mConfig.wakeScreenGestureAvailable() && alwaysOn,













                        Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,













                        mConfig.wakeScreenGestureAvailable(),















                        DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN,















                        false /* reports touch coordinates */,















                        false /* touchscreen */, mConfig.getWakeLockScreenDebounce()),