PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 27285 into eclair

Browse Source 
* changes:
  b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
This commit is contained in:
Android (Google) Code Review
2009-09-27 15:53:43 -04:00
parent a40fb23734 b662f54542
commit a38a1a77ab
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/bluetooth/BluetoothEnabler.java
View File

@@ -99,7 +99,7 @@ public class BluetoothEnabler implements Preference.OnPreferenceChangeListener {
// Don't update UI to opposite state until we're sure // Don't update UI to opposite state until we're sure
return false; return false;
} }
private void setEnabled(final boolean enable) { private void setEnabled(final boolean enable) {
// Disable preference // Disable preference
mCheckBoxPreference.setEnabled(false); mCheckBoxPreference.setEnabled(false);
@@ -115,8 +115,16 @@ public class BluetoothEnabler implements Preference.OnPreferenceChangeListener {
mCheckBoxPreference.setSummary(state == BluetoothAdapter.STATE_OFF ? mCheckBoxPreference.setSummary(state == BluetoothAdapter.STATE_OFF ?
mOriginalSummary : mOriginalSummary :
null); null);
mCheckBoxPreference.setEnabled(isEnabledByDependency()); /*
* Don't ever disable the preference. Only enable here. Disablement
* is taken care of by the dependency code. If this is disabled
* here, it may not be re-enabled from the framework when dependency
* is met. http://b/issue?id=2053751
*/
if (isEnabledByDependency()) {
mCheckBoxPreference.setEnabled(true);
}
} else if (state == BluetoothAdapter.STATE_TURNING_ON || } else if (state == BluetoothAdapter.STATE_TURNING_ON ||
state == BluetoothAdapter.STATE_TURNING_OFF) { state == BluetoothAdapter.STATE_TURNING_OFF) {