diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-18 15:38:14 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-10-18 15:38:14 -0700 |
| commit | 8d9a1f66d9d3dbbd45a56d441a746ec11dba7645 (patch) | |
| tree | e4d94bba0ca89fade118384202ac15d0cf7e03f5 /packages | |
| parent | b98c2fb0998b2ad6bffe9c06dd358ba4705eaa4b (diff) | |
| download | frameworks_base-8d9a1f66d9d3dbbd45a56d441a746ec11dba7645.zip frameworks_base-8d9a1f66d9d3dbbd45a56d441a746ec11dba7645.tar.gz frameworks_base-8d9a1f66d9d3dbbd45a56d441a746ec11dba7645.tar.bz2 | |
More migration to Global settings.
Bug: 7375796
Change-Id: I3954ce141ad30073896090a28eee743ba15fd736
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/BootReceiver.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/power/PowerUI.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/BootReceiver.java b/packages/SystemUI/src/com/android/systemui/BootReceiver.java index de005aa..d3ce30d 100644 --- a/packages/SystemUI/src/com/android/systemui/BootReceiver.java +++ b/packages/SystemUI/src/com/android/systemui/BootReceiver.java @@ -35,7 +35,7 @@ public class BootReceiver extends BroadcastReceiver { try { // Start the load average overlay, if activated ContentResolver res = context.getContentResolver(); - if (Settings.System.getInt(res, Settings.System.SHOW_PROCESSES, 0) != 0) { + if (Settings.Global.getInt(res, Settings.Global.SHOW_PROCESSES, 0) != 0) { Intent loadavg = new Intent(context, com.android.systemui.LoadAverageService.class); context.startService(loadavg); } diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java index 07fd0ab..318448e 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java @@ -237,9 +237,9 @@ public class PowerUI extends SystemUI { } final ContentResolver cr = mContext.getContentResolver(); - if (Settings.System.getInt(cr, Settings.System.POWER_SOUNDS_ENABLED, 1) == 1) { - final String soundPath = Settings.System.getString(cr, - Settings.System.LOW_BATTERY_SOUND); + if (Settings.Global.getInt(cr, Settings.Global.POWER_SOUNDS_ENABLED, 1) == 1) { + final String soundPath = Settings.Global.getString(cr, + Settings.Global.LOW_BATTERY_SOUND); if (soundPath != null) { final Uri soundUri = Uri.parse("file://" + soundPath); if (soundUri != null) { |