Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge "Fix status bar brightness control key" into ics

  • Loading branch information...
commit 843609a7d1ee88f9bcc10bd8314981a9a188a054 2 parents 0911697 + 95d65cf
@cyanogen cyanogen authored Gerrit Code Review committed
View
2  core/java/android/provider/Settings.java
@@ -2214,7 +2214,7 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) {
*
* @hide
*/
- public static final String STATUS_BAR_BRIGHTNESS_TOGGLE = "status_bar_brightness_toggle";
+ public static final String STATUS_BAR_BRIGHTNESS_CONTROL = "status_bar_brightness_control";
/**
* Whether to use a separate delay for "slide to unlock" and security
View
4 packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -252,7 +252,7 @@
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 void onChange(boolean selfChange) {
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;
Please sign in to comment.
Something went wrong with that request. Please try again.