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

Commit 55e30f38 authored by Ronish Kalia's avatar Ronish Kalia Committed by Android (Google) Code Review
Browse files

Merge changes from topic "qr-code-and" 

* changes:
  Add tests for QRCodeScannerController
  Add tests for QRCodeScannerTile
  Add a lock screen entry point for QR Code scanner
  Add settings keys for QR code scanner settings
  Add a quick settings entry point for QR Code Scanner
  Create a controller for QR Code Scanner in android
parents d1e53443 8d6c2f80

core/java/android/provider/Settings.java

+17 −0
Original line number Diff line number Diff line
@@ -9666,6 +9666,23 @@ public final class Settings { 
        @Readable

        public static final String INSTANT_APPS_ENABLED = "instant_apps_enabled";













        /**













         * Whether qr code scanner should be accessible from the lockscreen













         *













         * @hide













         */













        public static final String LOCK_SCREEN_SHOW_QR_CODE_SCANNER =













                "lock_screen_show_qr_code_scanner";

























        /**













         * Whether or not to enable qr code code scanner setting to enable/disable lockscreen













         * entry point. Any value apart from null means setting needs to be enabled













         *













         * @hide













         */













        public static final String SHOW_QR_CODE_SCANNER_SETTING =













                "show_qr_code_scanner_setting";



























        /**















         * Has this pairable device been paired or upgraded from a previously paired system.















         * @hide

































core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java



+6
−0






























Original line number
Diff line number
Diff line








@@ -506,6 +506,12 @@ public final class SystemUiDeviceConfigFlags {













     */















    public static final String USE_DELEGATE_CHOOSER = "use_delegate_chooser";





























    /**













     * (string) Name of the default QR code scanner activity. On the eligible devices this activity













     * is provided by GMS core.













     */













    public static final String DEFAULT_QR_CODE_SCANNER = "default_qr_code_scanner";





























    private SystemUiDeviceConfigFlags() {















    }















}
























packages/SettingsProvider/res/values/defaults.xml



+3
−0






























Original line number
Diff line number
Diff line








@@ -260,6 +260,9 @@













    <!-- Default for Settings.Secure.ONE_HANDED_MODE_ACTIVATED -->















    <bool name="def_one_handed_mode_activated">false</bool>





























    <!-- Default for Settings.Secure.LOCK_SCREEN_SHOW_QR_CODE_SCANNER -->













    <bool name="def_lock_screen_show_qr_code_scanner">true</bool>





























    <!-- ========================================== -->















    <!-- Default values for wear specific settings. -->

















































packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java



+1
−0






























Original line number
Diff line number
Diff line








@@ -192,5 +192,6 @@ public class SecureSettings {













        Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED,















        Settings.Secure.LOCKSCREEN_SHOW_CONTROLS,















        Settings.Secure.LOCKSCREEN_SHOW_WALLET,













        Settings.Secure.LOCK_SCREEN_SHOW_QR_CODE_SCANNER,















    };















}
























packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java



+1
−0






























Original line number
Diff line number
Diff line








@@ -153,6 +153,7 @@ public class SecureSettingsValidators {













        VALIDATORS.put(Secure.POWER_MENU_LOCKED_SHOW_CONTENT, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.LOCKSCREEN_SHOW_CONTROLS, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.LOCKSCREEN_SHOW_WALLET, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.LOCK_SCREEN_SHOW_QR_CODE_SCANNER, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.DOZE_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.DOZE_ALWAYS_ON, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.DOZE_PICK_UP_GESTURE, BOOLEAN_VALIDATOR);