am c26442e9: am 65f49474: Restore backlight brightness after restoring auto ALS mode.

Merge commit 'c26442e923d9deb5bea3fa78da661b1eb24bd965'

* commit 'c26442e923d9deb5bea3fa78da661b1eb24bd965':
  Restore backlight brightness after restoring auto ALS mode.
This commit is contained in:
Mike Lockwood
2009-09-17 09:52:38 -07:00
committed by Android Git Automerger

View File

@@ -121,10 +121,11 @@ public class BrightnessPreference extends SeekBarPreference implements
mCheckBox.isChecked() ? 1 : 0);
}
} else {
setBrightness(mOldBrightness);
if (mAutomaticAvailable) {
setMode(mOldAutomatic);
}
// brightness needs to be restored after restoring ALS mode
setBrightness(mOldBrightness);
}
}