Merge "Add a hidden flag to control Settings UI"

2017-01-26 19:36:30 +00:00
parent 325026dd5c 825f69a5e6
commit 5469b3d323
1 changed files with 8 additions and 0 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9561,6 +9561,14 @@ public final class Settings {
         */
        public static final String CONTACTS_DATABASE_WAL_ENABLED = "contacts_database_wal_enabled";

+        /**
+         * Flag to enable the link to location permissions in location setting. Set to 0 to disable.
+         *
+         * @hide
+         */
+        public static final String LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED =
+                "location_settings_link_to_permissions_enabled";
+
        /**
         * Settings to backup. This is here so that it's in the same place as the settings
         * keys and easy to update.