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

Commit cdb2d3ae authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Android (Google) Code Review
Browse files

Merge "Remove Settings.System.SCREEN_BRIGHTNESS_FLOAT" into main

parents b3b883ad 5bfb6333

core/java/android/provider/Settings.java

+0 −8
Original line number Diff line number Diff line
@@ -5122,13 +5122,6 @@ public final class Settings { 
        @Readable

        public static final String SCREEN_BRIGHTNESS = "screen_brightness";













        /**













         * The screen backlight brightness between 0.0f and 1.0f.













         * @hide













         */













        @Readable













        public static final String SCREEN_BRIGHTNESS_FLOAT = "screen_brightness_float";



























        /**















         * Control whether to enable automatic brightness mode.















         */










@@ -6273,7 +6266,6 @@ public final class Settings {













            PUBLIC_SETTINGS.add(DIM_SCREEN);















            PUBLIC_SETTINGS.add(SCREEN_OFF_TIMEOUT);















            PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS);













            PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_FLOAT);















            PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_MODE);















            PUBLIC_SETTINGS.add(MODE_RINGER_STREAMS_AFFECTED);















            PUBLIC_SETTINGS.add(MUTE_STREAMS_AFFECTED);

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -2949,9 +2949,6 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ,















                SystemSettingsProto.Screen.AUTO_BRIGHTNESS_ADJ);













        dumpSetting(s, p,













                Settings.System.SCREEN_BRIGHTNESS_FLOAT,













                SystemSettingsProto.Screen.BRIGHTNESS_FLOAT);















        p.end(screenToken);































        dumpSetting(s, p,

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -935,7 +935,6 @@ public class SettingsBackupTest {













                        Settings.System.VOLUME_VOICE, // deprecated since API 2?















                        Settings.System.WHEN_TO_MAKE_WIFI_CALLS, // bug?















                        Settings.System.WINDOW_ORIENTATION_LISTENER_LOG, // used for debugging only













                        Settings.System.SCREEN_BRIGHTNESS_FLOAT,















                        Settings.System.SCREEN_BRIGHTNESS_FOR_ALS,















                        Settings.System.WEAR_ACCESSIBILITY_GESTURE_ENABLED_DURING_OOBE,















                        Settings.System.WEAR_TTS_PREWARM_ENABLED,

































services/core/java/com/android/server/pm/UserRestrictionsUtils.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -859,7 +859,6 @@ public class UserRestrictionsUtils {













                break;































            case android.provider.Settings.System.SCREEN_BRIGHTNESS:













            case android.provider.Settings.System.SCREEN_BRIGHTNESS_FLOAT:















            case android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE:















                if (callingUid == Process.SYSTEM_UID) {















                    return false;