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

Commit 518a3d82 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Remove auto-brightness adjustment knob. 

Not yet ready for release.

Change-Id: I75bc87f35af47c6baac1f26953d8bf3e38062c92
parent a53de062

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -18410,7 +18410,6 @@ package android.provider { 
    field public static final java.lang.String RADIO_NFC = "nfc";

    field public static final java.lang.String RADIO_WIFI = "wifi";

    field public static final java.lang.String RINGTONE = "ringtone";

    field public static final java.lang.String SCREEN_AUTO_BRIGHTNESS_ADJ = "screen_auto_brightness_adj";

    field public static final java.lang.String SCREEN_BRIGHTNESS = "screen_brightness";

    field public static final java.lang.String SCREEN_BRIGHTNESS_MODE = "screen_brightness_mode";

    field public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1; // 0x1

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -1410,6 +1410,7 @@ public final class Settings { 
        /**

         * Adjustment to auto-brightness to make it generally more (>0.0 <1.0)

         * or less (<0.0 >-1.0) bright.

         * @hide

         */

        public static final String SCREEN_AUTO_BRIGHTNESS_ADJ = "screen_auto_brightness_adj";

services/java/com/android/server/PowerManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ public class PowerManagerService extends IPowerManager.Stub 
                //mDimScreen = getInt(DIM_SCREEN) != 0;



                mScreenBrightnessSetting = getInt(SCREEN_BRIGHTNESS, DEFAULT_SCREEN_BRIGHTNESS);

                mLightSensorAdjustSetting = getFloat(SCREEN_AUTO_BRIGHTNESS_ADJ, 0);

                mLightSensorAdjustSetting = 0; //getFloat(SCREEN_AUTO_BRIGHTNESS_ADJ, 0);



                // SCREEN_BRIGHTNESS_MODE, default to manual

                setScreenBrightnessMode(getInt(SCREEN_BRIGHTNESS_MODE,
@@ -649,7 +649,7 @@ public class PowerManagerService extends IPowerManager.Stub 
                        + Settings.System.NAME + "=?) or ("

                        + Settings.System.NAME + "=?)",

                new String[]{STAY_ON_WHILE_PLUGGED_IN, SCREEN_OFF_TIMEOUT, DIM_SCREEN, SCREEN_BRIGHTNESS,

                        SCREEN_BRIGHTNESS_MODE, SCREEN_AUTO_BRIGHTNESS_ADJ,

                        SCREEN_BRIGHTNESS_MODE, /*SCREEN_AUTO_BRIGHTNESS_ADJ,*/

                        WINDOW_ANIMATION_SCALE, TRANSITION_ANIMATION_SCALE},

                null);

        mSettings = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, mHandler);