Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 843609a7 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Fix status bar brightness control key" into ics

parents 0911697d 95d65cf7

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -2214,7 +2214,7 @@ public final class Settings { 
         *

         * @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

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+2 −2
Original line number Diff line number Diff line
@@ -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;