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

Merge commit '53dcdeeb85e523e0b752d802d3413f5d4001d575' into eclair-mr2

* commit '53dcdeeb85e523e0b752d802d3413f5d4001d575':
  Don't restore old brightness when cancelling brightness dialog in automatic mode.
This commit is contained in:
Mike Lockwood
2009-10-29 13:45:44 -07:00
committed by Android Git Automerger

View File

@@ -120,8 +120,9 @@ public class BrightnessPreference extends SeekBarPreference implements
if (mAutomaticAvailable) {
setMode(mOldAutomatic);
}
// brightness needs to be restored after restoring ALS mode
setBrightness(mOldBrightness);
if (!mAutomaticAvailable || mOldAutomatic == 0) {
setBrightness(mOldBrightness);
}
}
}