Merge change 24646 into eclair
* changes:
Aggregate the security settings for WiFi network configuration.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7a1760d..c666871 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -300,7 +300,6 @@
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.SECURITY_SETTINGS" />
<action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
- <action android:name="android.security.ADD_CREDENTIAL" />
<action android:name="android.security.UNLOCK_CREDENTIAL_STORAGE" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index e2fe0f2..2bba814 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -121,10 +121,11 @@
mCheckBox.isChecked() ? 1 : 0);
}
} else {
- setBrightness(mOldBrightness);
if (mAutomaticAvailable) {
setMode(mOldAutomatic);
}
+ // brightness needs to be restored after restoring ALS mode
+ setBrightness(mOldBrightness);
}
}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index f3c53ce..24b89b1 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -810,8 +810,7 @@
}
private void installCertFromSdCard() {
- // TODO: uncomment this when the feature is ready
- //startActivity(new Intent(CertTool.ACTION_INSTALL_CERT_FROM_SDCARD));
+ startActivity(new Intent(CertTool.ACTION_INSTALL_CERT_FROM_SDCARD));
}
private TextView showError(int messageId) {