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

Commit 36c6d0e0 authored by Holly Sun's avatar Holly Sun Committed by Holly Jiuyu Sun
Browse files

Use separate Settings.Secure entry for the new LPH settings page. 

Bug: 294858168
Test: unit + manual
Change-Id: I9ef2661f2acb043517e0569e771f8cf753382263
Merged-In: Ia01d34d22ff8fe7d82a934c91969220584f4f34a
parent c7bce336

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -10504,6 +10504,14 @@ public final class Settings { 
        public static final String SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED =

                "search_press_hold_nav_handle_enabled";













        /**













         * Whether long-pressing on the home button can trigger search.













         *













         * @hide













         */













        public static final String SEARCH_LONG_PRESS_HOME_ENABLED =













                "search_long_press_home_enabled";



























        /**















         * Control whether Trust Agents are in active unlock or extend unlock mode.















         * @hide

































core/proto/android/providers/settings/secure.proto



+1
−0




























Original line number
Diff line number
Diff line








@@ -138,6 +138,7 @@ message SecureSettingsProto {













        optional SettingProto touch_gesture_enabled = 10 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto long_press_home_enabled = 11 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto search_press_hold_nav_handle_enabled = 12 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto search_long_press_home_enabled = 13 [ (android.privacy).dest = DEST_AUTOMATIC ];















    }















    optional Assist assist = 7;

















































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



+2
−1




























Original line number
Diff line number
Diff line








@@ -241,6 +241,7 @@ public class SecureSettings {













        Settings.Secure.HEARING_AID_MEDIA_ROUTING,















        Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,















        Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,













        Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED













        Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED,













        Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED















    };















}
























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



+1
−0




























Original line number
Diff line number
Diff line








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













        VALIDATORS.put(Secure.ASSIST_TOUCH_GESTURE_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ASSIST_LONG_PRESS_HOME_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.SEARCH_LONG_PRESS_HOME_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.VR_DISPLAY_MODE, new DiscreteValueValidator(new String[] {"0", "1"}));















        VALIDATORS.put(Secure.NOTIFICATION_BADGING, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.NOTIFICATION_DISMISS_RTL, BOOLEAN_VALIDATOR);

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -1929,6 +1929,9 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED,















                SecureSettingsProto.Assist.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED);













        dumpSetting(s, p,













                Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED,













                SecureSettingsProto.Assist.SEARCH_LONG_PRESS_HOME_ENABLED);















        p.end(assistToken);































        final long assistHandlesToken = p.start(SecureSettingsProto.ASSIST_HANDLES);