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

Commit 13b0cb98 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Renaming gesture

Bug: 111414690
Test: make
Change-Id: I9d2a6507a942c56fe5b626d8dce46321ff70014b
parent 8750eebf
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -7267,12 +7267,12 @@ public final class Settings {
        private static final Validator DOZE_DOUBLE_TAP_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;
        /**
         * Whether the device should pulse on reach gesture.
         * Gesture that wakes up the lock screen.
         * @hide
         */
        public static final String DOZE_REACH_GESTURE = "doze_reach_gesture";
        public static final String DOZE_WAKE_LOCK_SCREEN_GESTURE = "doze_wake_lock_screen_gesture";
        private static final Validator DOZE_REACH_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;
        private static final Validator DOZE_WAKE_LOCK_SCREEN_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;
        /**
         * Gesture that wakes up the display, showing the ambient version of the status bar.
@@ -8184,7 +8184,7 @@ public final class Settings {
            DOZE_ALWAYS_ON,
            DOZE_PICK_UP_GESTURE,
            DOZE_DOUBLE_TAP_GESTURE,
            DOZE_REACH_GESTURE,
            DOZE_WAKE_LOCK_SCREEN_GESTURE,
            DOZE_WAKE_SCREEN_GESTURE,
            NFC_PAYMENT_DEFAULT_COMPONENT,
            AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
@@ -8331,7 +8331,7 @@ public final class Settings {
            VALIDATORS.put(DOZE_ALWAYS_ON, DOZE_ALWAYS_ON_VALIDATOR);
            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_REACH_GESTURE, DOZE_REACH_GESTURE_VALIDATOR);
            VALIDATORS.put(DOZE_WAKE_LOCK_SCREEN_GESTURE, DOZE_WAKE_LOCK_SCREEN_GESTURE_VALIDATOR);
            VALIDATORS.put(DOZE_WAKE_SCREEN_GESTURE, DOZE_WAKE_SCREEN_GESTURE_VALIDATOR);
            VALIDATORS.put(NFC_PAYMENT_DEFAULT_COMPONENT, NFC_PAYMENT_DEFAULT_COMPONENT_VALIDATOR);
            VALIDATORS.put(AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
+7 −7
Original line number Diff line number Diff line
@@ -66,13 +66,13 @@ public class AmbientDisplayConfiguration {
        return !TextUtils.isEmpty(doubleTapSensorType());
    }

    public boolean reachGestureEnabled(int user) {
        return boolSettingDefaultOn(Settings.Secure.DOZE_REACH_GESTURE, user)
                && reachGestureAvailable();
    public boolean wakeLockScreenGestureEnabled(int user) {
        return boolSettingDefaultOn(Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE, user)
                && wakeLockScreenGestureAvailable();
    }

    public boolean reachGestureAvailable() {
        return !TextUtils.isEmpty(reachSensorType());
    public boolean wakeLockScreenGestureAvailable() {
        return !TextUtils.isEmpty(wakeLockScreenSensorType());
    }

    public boolean wakeScreenGestureEnabled(int user) {
@@ -92,8 +92,8 @@ public class AmbientDisplayConfiguration {
        return mContext.getResources().getString(R.string.config_dozeLongPressSensorType);
    }

    public String reachSensorType() {
        return mContext.getResources().getString(R.string.config_dozeReachSensorType);
    public String wakeLockScreenSensorType() {
        return mContext.getResources().getString(R.string.config_dozeWakeLockScreenSensorType);
    }

    public String wakeScreenSensorType() {
+2 −2
Original line number Diff line number Diff line
@@ -2113,8 +2113,8 @@
    <!-- Type of the long press sensor. Empty if long press is not supported. -->
    <string name="config_dozeLongPressSensorType" translatable="false"></string>

    <!-- Type of the reach sensor. Empty if reach is not supported. -->
    <string name="config_dozeReachSensorType" translatable="false"></string>
    <!-- Type of sensor that wakes up the lock screen. Empty if not supported. -->
    <string name="config_dozeWakeLockScreenSensorType" translatable="false"></string>

    <!-- Type of the wake up sensor. Empty if not supported. -->
    <string name="config_dozeWakeScreenSensorType" translatable="false"></string>
+1 −1
Original line number Diff line number Diff line
@@ -3277,7 +3277,7 @@
  <java-symbol type="array" name="config_hideWhenDisabled_packageNames" />

  <java-symbol type="string" name="config_dozeLongPressSensorType" />
  <java-symbol type="string" name="config_dozeReachSensorType" />
  <java-symbol type="string" name="config_dozeWakeLockScreenSensorType" />

  <java-symbol type="array" name="config_allowedGlobalInstantAppSettings" />
  <java-symbol type="array" name="config_allowedSystemInstantAppSettings" />
+4 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class DozeLog {
    public static final int PULSE_REASON_SENSOR_PICKUP = 3;
    public static final int PULSE_REASON_SENSOR_DOUBLE_TAP = 4;
    public static final int PULSE_REASON_SENSOR_LONG_PRESS = 5;
    public static final int PULSE_REASON_SENSOR_REACH = 6;
    public static final int PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN = 6;
    public static final int REASON_SENSOR_WAKE_UP = 7;

    private static boolean sRegisterKeyguardCallback = true;
@@ -177,9 +177,9 @@ public class DozeLog {
        log("state " + state);
    }

    public static void traceReachWakeUp() {
    public static void traceWakeLockScreenWakeUp() {
        if (!ENABLED) return;
        log("reachWakeUp");
        log("wakeLockScreenWakeUp");
    }

    public static void traceProximityResult(Context context, boolean near, long millis,
@@ -199,7 +199,7 @@ public class DozeLog {
            case PULSE_REASON_SENSOR_PICKUP: return "pickup";
            case PULSE_REASON_SENSOR_DOUBLE_TAP: return "doubletap";
            case PULSE_REASON_SENSOR_LONG_PRESS: return "longpress";
            case PULSE_REASON_SENSOR_REACH: return "reach";
            case PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN: return "wakeLockScreen";
            case REASON_SENSOR_WAKE_UP: return "wakeup";
            default: throw new IllegalArgumentException("bad reason: " + pulseReason);
        }
Loading