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

Commit 63f04dae authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode. 

Merge commit '53dcdeeb' into eclair-plus-aosp

* commit '53dcdeeb':
  Don't restore old brightness when cancelling brightness dialog in automatic mode.
parents 5b1f4b49 53dcdeeb

src/com/android/settings/BrightnessPreference.java

+3 −2
Original line number Diff line number Diff line
@@ -120,10 +120,11 @@ public class BrightnessPreference extends SeekBarPreference implements 
            if (mAutomaticAvailable) {

                setMode(mOldAutomatic);

            }

            // brightness needs to be restored after restoring ALS mode

            if (!mAutomaticAvailable || mOldAutomatic == 0) {

                setBrightness(mOldBrightness);

            }

        }

    }

    

    private void setBrightness(int brightness) {

        try {