diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-03-23 10:05:44 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-03-23 10:05:44 +0300 |
| commit | 843609a7d1ee88f9bcc10bd8314981a9a188a054 (patch) | |
| tree | f1b033e7d03ff41973fcebc31e78f5a5b9eaaa35 /packages | |
| parent | 0911697de617443f742e9604bc3d8c261f18f79b (diff) | |
| parent | 95d65cf7839f159cc529c58b11d98a74ca91a9bc (diff) | |
| download | frameworks_base-843609a7d1ee88f9bcc10bd8314981a9a188a054.zip frameworks_base-843609a7d1ee88f9bcc10bd8314981a9a188a054.tar.gz frameworks_base-843609a7d1ee88f9bcc10bd8314981a9a188a054.tar.bz2 | |
Merge "Fix status bar brightness control key" into ics
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index e72a741..da47219 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -252,7 +252,7 @@ public class PhoneStatusBar extends StatusBar { void observe() { ContentResolver resolver = mContext.getContentResolver(); resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.STATUS_BAR_BRIGHTNESS_TOGGLE), false, this); + Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL), false, this); resolver.registerContentObserver(Settings.System.getUriFor( Settings.System.SCREEN_BRIGHTNESS_MODE), false, this); update(); @@ -266,7 +266,7 @@ public class PhoneStatusBar extends StatusBar { public void update() { ContentResolver resolver = mContext.getContentResolver(); mBrightnessControl = Settings.System.getInt(resolver, - Settings.System.STATUS_BAR_BRIGHTNESS_TOGGLE, 0) != 0; + Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL, 0) != 0; mAutoBrightness = Settings.System.getInt(resolver, Settings.System.SCREEN_BRIGHTNESS_MODE, 0) == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; |