commit 99bdf2ce23cf9a48dc3d8f020b4de01da67130a5
author Jake Hamby <jhamby@google.com> Fri Jan 07 10:54:05 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 07 10:54:05 2011 -0800
tree 2785129b74d623574896abc8568a9132dd464b8b
parent 5777bd011374a9acd8183e0f4523fa9bcdea1aeb
parent 4bd7cb0e07a1fbc4e658810631132cebd5b1fdd6

Merge "Don't auto connect reverse tethering after pairing." into honeycomb

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c7fcf6a..3a76a9d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -849,7 +849,7 @@
         <activity android:name=".bluetooth.BluetoothPairingDialog"
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
-                  android:theme="@*android:style/Theme.Dialog.Alert">
+                  android:theme="@*android:style/Theme.Holo.Dialog.Alert">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -873,7 +873,7 @@
                   android:label="@string/bluetooth_permission_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
-                  android:theme="@*android:style/Theme.Dialog.Alert">
+                  android:theme="@*android:style/Theme.Holo.Dialog.Alert">
             <intent-filter>
                 <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
                 <action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" />
@@ -885,7 +885,7 @@
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
-                  android:theme="@*android:style/Theme.Dialog.Alert">
+                  android:theme="@*android:style/Theme.Holo.Dialog.Alert">
         </activity>
 
         <receiver android:name=".bluetooth.BluetoothPairingRequest">

src/com/android/settings/AccessibilitySettings.java

diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 6cc5508..cec62b0 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -161,7 +161,7 @@
             if (serviceState == 1) {
                 mToggleAccessibilityCheckBox.setChecked(true);
                 if (savedInstanceState != null) {
-                    restoreInstanceStrate(savedInstanceState);
+                    restoreInstanceState(savedInstanceState);
                 }
             } else {
                 setAccessibilityServicePreferencesState(false);
@@ -200,7 +200,7 @@
     /**
      * Restores the instance state from <code>savedInstanceState</code>.
      */
-    private void restoreInstanceStrate(Bundle savedInstanceState) {
+    private void restoreInstanceState(Bundle savedInstanceState) {
         String key = savedInstanceState.getString(KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX);
         if (key != null) {
             Preference preference = findPreference(key);
@@ -230,6 +230,8 @@
             Preference pref = mAccessibilityServicesCategory.getPreference(i);
             pref.setEnabled(isEnabled);
         }
+
+        mToggleScriptInjectionCheckBox.setEnabled(isEnabled);
     }
 
     @Override