Skip to content

Commit 6e2bee7

Browse files
jsharkeyjsharkey
committed
Migrate more System and Secure settings to Global.
Includes telephony, WindowManager, PackageManager, and debugging settings. Update API to point towards moved values. Bug: 7231764, 7231252, 7231156 Change-Id: I5828747205708872f19f83a5bc821ed0a801cb79
1 parent 0944d62 commit 6e2bee7

File tree

10 files changed

+262
-120
lines changed

10 files changed

+262
-120
lines changed

‎api/17.txt‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18810,11 +18810,14 @@ package android.provider {
1881018810
field public static final java.lang.String ADB_ENABLED = "adb_enabled";
1881118811
field public static final java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";
1881218812
field public static final java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
18813+
field public static final java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
18814+
field public static final java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
1881318815
field public static final java.lang.String AUTO_TIME = "auto_time";
1881418816
field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
1881518817
field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";
1881618818
field public static final android.net.Uri CONTENT_URI;
1881718819
field public static final java.lang.String DATA_ROAMING = "data_roaming";
18820+
field public static final java.lang.String DEBUG_APP = "debug_app";
1881818821
field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
1881918822
field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";
1882018823
field public static final java.lang.String HTTP_PROXY = "http_proxy";
@@ -18825,10 +18828,13 @@ package android.provider {
1882518828
field public static final java.lang.String RADIO_CELL = "cell";
1882618829
field public static final java.lang.String RADIO_NFC = "nfc";
1882718830
field public static final java.lang.String RADIO_WIFI = "wifi";
18831+
field public static final java.lang.String SHOW_PROCESSES = "show_processes";
1882818832
field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
1882918833
field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version";
18834+
field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
1883018835
field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
1883118836
field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
18837+
field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
1883218838
field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
1883318839
field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
1883418840
field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
@@ -18840,6 +18846,7 @@ package android.provider {
1884018846
field public static final int WIFI_SLEEP_POLICY_NEVER = 2; // 0x2
1884118847
field public static final int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED = 1; // 0x1
1884218848
field public static final java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on";
18849+
field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
1884318850
}
1884418851

1884518852
public static class Settings.NameValueTable implements android.provider.BaseColumns {
@@ -18954,9 +18961,9 @@ package android.provider {
1895418961
field public static final deprecated java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";
1895518962
field public static final deprecated java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
1895618963
field public static final java.lang.String ALARM_ALERT = "alarm_alert";
18957-
field public static final java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
18964+
field public static final deprecated java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
1895818965
field public static final deprecated java.lang.String ANDROID_ID = "android_id";
18959-
field public static final java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
18966+
field public static final deprecated java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
1896018967
field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible";
1896118968
field public static final deprecated java.lang.String AUTO_TIME = "auto_time";
1896218969
field public static final deprecated java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
@@ -18966,7 +18973,7 @@ package android.provider {
1896618973
field public static final android.net.Uri CONTENT_URI;
1896718974
field public static final deprecated java.lang.String DATA_ROAMING = "data_roaming";
1896818975
field public static final java.lang.String DATE_FORMAT = "date_format";
18969-
field public static final java.lang.String DEBUG_APP = "debug_app";
18976+
field public static final deprecated java.lang.String DEBUG_APP = "debug_app";
1897018977
field public static final android.net.Uri DEFAULT_ALARM_ALERT_URI;
1897118978
field public static final android.net.Uri DEFAULT_NOTIFICATION_URI;
1897218979
field public static final android.net.Uri DEFAULT_RINGTONE_URI;
@@ -19005,7 +19012,7 @@ package android.provider {
1900519012
field public static final deprecated java.lang.String SETTINGS_CLASSNAME = "settings_classname";
1900619013
field public static final java.lang.String SETUP_WIZARD_HAS_RUN = "setup_wizard_has_run";
1900719014
field public static final java.lang.String SHOW_GTALK_SERVICE_STATUS = "SHOW_GTALK_SERVICE_STATUS";
19008-
field public static final java.lang.String SHOW_PROCESSES = "show_processes";
19015+
field public static final deprecated java.lang.String SHOW_PROCESSES = "show_processes";
1900919016
field public static final deprecated java.lang.String SHOW_WEB_SUGGESTIONS = "show_web_suggestions";
1901019017
field public static final java.lang.String SOUND_EFFECTS_ENABLED = "sound_effects_enabled";
1901119018
field public static final deprecated java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
@@ -19015,7 +19022,7 @@ package android.provider {
1901519022
field public static final java.lang.String TEXT_AUTO_REPLACE = "auto_replace";
1901619023
field public static final java.lang.String TEXT_SHOW_PASSWORD = "show_password";
1901719024
field public static final java.lang.String TIME_12_24 = "time_12_24";
19018-
field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
19025+
field public static final deprecated java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
1901919026
field public static final deprecated java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
1902019027
field public static final java.lang.String USER_ROTATION = "user_rotation";
1902119028
field public static final deprecated java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
@@ -19028,8 +19035,8 @@ package android.provider {
1902819035
field public static final java.lang.String[] VOLUME_SETTINGS;
1902919036
field public static final java.lang.String VOLUME_SYSTEM = "volume_system";
1903019037
field public static final java.lang.String VOLUME_VOICE = "volume_voice";
19031-
field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
19032-
field public static final java.lang.String WALLPAPER_ACTIVITY = "wallpaper_activity";
19038+
field public static final deprecated java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
19039+
field public static final deprecated java.lang.String WALLPAPER_ACTIVITY = "wallpaper_activity";
1903319040
field public static final deprecated java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
1903419041
field public static final deprecated java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
1903519042
field public static final deprecated java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
@@ -19057,7 +19064,7 @@ package android.provider {
1905719064
field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count";
1905819065
field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms";
1905919066
field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms";
19060-
field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
19067+
field public static final deprecated java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
1906119068
}
1906219069

1906319070
public class SyncStateContract {

‎api/current.txt‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18815,11 +18815,14 @@ package android.provider {
1881518815
field public static final java.lang.String ADB_ENABLED = "adb_enabled";
1881618816
field public static final java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";
1881718817
field public static final java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
18818+
field public static final java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
18819+
field public static final java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
1881818820
field public static final java.lang.String AUTO_TIME = "auto_time";
1881918821
field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
1882018822
field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";
1882118823
field public static final android.net.Uri CONTENT_URI;
1882218824
field public static final java.lang.String DATA_ROAMING = "data_roaming";
18825+
field public static final java.lang.String DEBUG_APP = "debug_app";
1882318826
field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
1882418827
field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";
1882518828
field public static final java.lang.String HTTP_PROXY = "http_proxy";
@@ -18830,10 +18833,13 @@ package android.provider {
1883018833
field public static final java.lang.String RADIO_CELL = "cell";
1883118834
field public static final java.lang.String RADIO_NFC = "nfc";
1883218835
field public static final java.lang.String RADIO_WIFI = "wifi";
18836+
field public static final java.lang.String SHOW_PROCESSES = "show_processes";
1883318837
field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
1883418838
field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version";
18839+
field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
1883518840
field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
1883618841
field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
18842+
field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
1883718843
field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
1883818844
field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
1883918845
field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
@@ -18845,6 +18851,7 @@ package android.provider {
1884518851
field public static final int WIFI_SLEEP_POLICY_NEVER = 2; // 0x2
1884618852
field public static final int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED = 1; // 0x1
1884718853
field public static final java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on";
18854+
field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
1884818855
}
1884918856

1885018857
public static class Settings.NameValueTable implements android.provider.BaseColumns {
@@ -18959,9 +18966,9 @@ package android.provider {
1895918966
field public static final deprecated java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";
1896018967
field public static final deprecated java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
1896118968
field public static final java.lang.String ALARM_ALERT = "alarm_alert";
18962-
field public static final java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
18969+
field public static final deprecated java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
1896318970
field public static final deprecated java.lang.String ANDROID_ID = "android_id";
18964-
field public static final java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
18971+
field public static final deprecated java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
1896518972
field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible";
1896618973
field public static final deprecated java.lang.String AUTO_TIME = "auto_time";
1896718974
field public static final deprecated java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
@@ -18971,7 +18978,7 @@ package android.provider {
1897118978
field public static final android.net.Uri CONTENT_URI;
1897218979
field public static final deprecated java.lang.String DATA_ROAMING = "data_roaming";
1897318980
field public static final java.lang.String DATE_FORMAT = "date_format";
18974-
field public static final java.lang.String DEBUG_APP = "debug_app";
18981+
field public static final deprecated java.lang.String DEBUG_APP = "debug_app";
1897518982
field public static final android.net.Uri DEFAULT_ALARM_ALERT_URI;
1897618983
field public static final android.net.Uri DEFAULT_NOTIFICATION_URI;
1897718984
field public static final android.net.Uri DEFAULT_RINGTONE_URI;
@@ -19010,7 +19017,7 @@ package android.provider {
1901019017
field public static final deprecated java.lang.String SETTINGS_CLASSNAME = "settings_classname";
1901119018
field public static final java.lang.String SETUP_WIZARD_HAS_RUN = "setup_wizard_has_run";
1901219019
field public static final java.lang.String SHOW_GTALK_SERVICE_STATUS = "SHOW_GTALK_SERVICE_STATUS";
19013-
field public static final java.lang.String SHOW_PROCESSES = "show_processes";
19020+
field public static final deprecated java.lang.String SHOW_PROCESSES = "show_processes";
1901419021
field public static final deprecated java.lang.String SHOW_WEB_SUGGESTIONS = "show_web_suggestions";
1901519022
field public static final java.lang.String SOUND_EFFECTS_ENABLED = "sound_effects_enabled";
1901619023
field public static final deprecated java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
@@ -19020,7 +19027,7 @@ package android.provider {
1902019027
field public static final java.lang.String TEXT_AUTO_REPLACE = "auto_replace";
1902119028
field public static final java.lang.String TEXT_SHOW_PASSWORD = "show_password";
1902219029
field public static final java.lang.String TIME_12_24 = "time_12_24";
19023-
field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
19030+
field public static final deprecated java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
1902419031
field public static final deprecated java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
1902519032
field public static final java.lang.String USER_ROTATION = "user_rotation";
1902619033
field public static final deprecated java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
@@ -19033,8 +19040,8 @@ package android.provider {
1903319040
field public static final java.lang.String[] VOLUME_SETTINGS;
1903419041
field public static final java.lang.String VOLUME_SYSTEM = "volume_system";
1903519042
field public static final java.lang.String VOLUME_VOICE = "volume_voice";
19036-
field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
19037-
field public static final java.lang.String WALLPAPER_ACTIVITY = "wallpaper_activity";
19043+
field public static final deprecated java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
19044+
field public static final deprecated java.lang.String WALLPAPER_ACTIVITY = "wallpaper_activity";
1903819045
field public static final deprecated java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
1903919046
field public static final deprecated java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
1904019047
field public static final deprecated java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
@@ -19062,7 +19069,7 @@ package android.provider {
1906219069
field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count";
1906319070
field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms";
1906419071
field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms";
19065-
field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
19072+
field public static final deprecated java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
1906619073
}
1906719074

1906819075
public class SyncStateContract {

‎core/java/android/inputmethodservice/InputMethodService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,8 +683,8 @@ void initViews() {
683683
com.android.internal.R.layout.input_method, null);
684684
mWindow.setContentView(mRootView);
685685
mRootView.getViewTreeObserver().addOnComputeInternalInsetsListener(mInsetsComputer);
686-
if (Settings.System.getInt(getContentResolver(),
687-
Settings.System.FANCY_IME_ANIMATIONS, 0) != 0) {
686+
if (Settings.Global.getInt(getContentResolver(),
687+
Settings.Global.FANCY_IME_ANIMATIONS, 0) != 0) {
688688
mWindow.getWindow().setWindowAnimations(
689689
com.android.internal.R.style.Animation_InputMethodFancy);
690690
}

0 commit comments

Comments
 (0)