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

Commit 434b36ec authored by Edgar Wang's avatar Edgar Wang Committed by android-build-merger
Browse files

Merge changes I261ad35f,Id2611b3c into qt-qpr1-dev 

am: d76cc783

Change-Id: I1c5f830f78239541c37990330cfd2eebbe7af0d8
parents dc27bde2 d76cc783

core/java/android/provider/Settings.java

+0 −8
Original line number Diff line number Diff line
@@ -9030,8 +9030,6 @@ public final class Settings { 
            DOZE_PICK_UP_GESTURE,

            DOZE_DOUBLE_TAP_GESTURE,

            DOZE_TAP_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,
@@ -9039,9 +9037,6 @@ public final class Settings { 
            FACE_UNLOCK_DISMISSES_KEYGUARD,

            FACE_UNLOCK_APP_ENABLED,

            FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,

            ASSIST_GESTURE_ENABLED,

            ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,

            ASSIST_GESTURE_WAKE_ENABLED,

            VR_DISPLAY_MODE,

            NOTIFICATION_BADGING,

            NOTIFICATION_DISMISS_RTL,
@@ -9074,12 +9069,9 @@ public final class Settings { 
            TRUST_AGENTS_EXTEND_UNLOCK,

            UI_NIGHT_MODE,

            LOCK_SCREEN_WHEN_TRUST_LOST,

            SKIP_GESTURE,

            SKIP_DIRECTION,

            SILENCE_GESTURE,

            THEME_CUSTOMIZATION_OVERLAY_PACKAGES,

            NAVIGATION_MODE,

            AWARE_ENABLED,

            SKIP_GESTURE_COUNT,

            SKIP_TOUCH_COUNT,

            SILENCE_ALARMS_GESTURE_COUNT,

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+8 −0
Original line number Diff line number Diff line
@@ -595,7 +595,10 @@ public class SettingsBackupTest { 
                 Settings.Secure.ANR_SHOW_BACKGROUND,

                 Settings.Secure.ASSISTANT,

                 Settings.Secure.ASSIST_DISCLOSURE_ENABLED,

                 Settings.Secure.ASSIST_GESTURE_ENABLED,

                 Settings.Secure.ASSIST_GESTURE_SENSITIVITY,

                 Settings.Secure.ASSIST_GESTURE_WAKE_ENABLED,

                 Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,

                 Settings.Secure.ASSIST_GESTURE_SETUP_COMPLETE,

                 Settings.Secure.ASSIST_SCREENSHOT_ENABLED,

                 Settings.Secure.ASSIST_STRUCTURE_ENABLED,
@@ -723,6 +726,11 @@ public class SettingsBackupTest { 
                 Settings.Secure.BIOMETRIC_DEBUG_ENABLED,

                 Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,

                 Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED,

                 Settings.Secure.AWARE_ENABLED,

                 Settings.Secure.SKIP_GESTURE,

                 Settings.Secure.SILENCE_GESTURE,

                 Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,

                 Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,

                 Settings.Secure.FACE_UNLOCK_RE_ENROLL);



    @Test