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

Commit cdf42466 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Remove PowerManager.setAutoBrightness() 



We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.

Change-Id: I1850549f513e3541b5761aae28ebc615410377de
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 9f1900dc

src/com/android/settings/BrightnessPreference.java

+6 −16
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ public class BrightnessPreference extends SeekBarPreference implements 
    }



    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {

        setMode(isChecked ? 1 : 0);

        setMode(isChecked ? Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC

                : Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);

        if (!isChecked) {

            setBrightness(mSeekBar.getProgress() + MINIMUM_BACKLIGHT);

        }
@@ -115,11 +116,6 @@ public class BrightnessPreference extends SeekBarPreference implements 
            Settings.System.putInt(getContext().getContentResolver(), 

                    Settings.System.SCREEN_BRIGHTNESS,

                    mSeekBar.getProgress() + MINIMUM_BACKLIGHT);

            if (mAutomaticAvailable) {

                Settings.System.putInt(getContext().getContentResolver(),

                        Settings.System.SCREEN_BRIGHTNESS_MODE,

                        mCheckBox.isChecked() ? 1 : 0);

            }

        } else {

            if (mAutomaticAvailable) {

                setMode(mOldAutomatic);
@@ -141,20 +137,14 @@ public class BrightnessPreference extends SeekBarPreference implements 
        }        

    }



    private void setMode(int automatic) {

        if (automatic != 0) {

    private void setMode(int mode) {

        if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {

            mSeekBar.setVisibility(View.GONE);

        } else {

            mSeekBar.setVisibility(View.VISIBLE);

        }

        try {

            IPowerManager power = IPowerManager.Stub.asInterface(

                    ServiceManager.getService("power"));

            if (power != null) {

                power.setAutoBrightness(automatic != 0);

            }

        } catch (RemoteException doe) {

        }

        Settings.System.putInt(getContext().getContentResolver(),

                Settings.System.SCREEN_BRIGHTNESS_MODE, mode);

    }

}

src/com/android/settings/widget/SettingsAppWidgetProvider.java

+1 −2
Original line number Diff line number Diff line
@@ -393,10 +393,9 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { 
                if (context.getResources().getBoolean(

                        com.android.internal.R.bool.config_automatic_brightness_available)) {

                    // Disable automatic brightness

                    power.setAutoBrightness(false);

                    Settings.System.putInt(context.getContentResolver(),

                            Settings.System.SCREEN_BRIGHTNESS_MODE,

                            0);

                            Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);

                    // Set it again in case auto brightness was on

                    power.setBacklightBrightness(brightness);

                }