Merge "Allows auto dismissing of bluetooth activation dialogs" into ics-aah

src/com/android/settings/bluetooth/RequestPermissionActivity.java

@@ -173,6 +173,11 @@ public class RequestPermissionActivity extends Activity implements
 
         mDialog = builder.create();
         mDialog.show();
+
+        if (getResources().getBoolean(R.bool.auto_confirm_bluetooth_activation_dialog) == true) {
+            // dismiss dialog immediately if settings say so
+            onClick(null, DialogInterface.BUTTON_POSITIVE);
+        }
     }
 
     @Override

src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java

@@ -62,6 +62,12 @@ public class RequestPermissionHelperActivity extends AlertActivity implements
         }
 
         createDialog();
+
+        if (getResources().getBoolean(R.bool.auto_confirm_bluetooth_activation_dialog) == true) {
+            // dismiss dialog immediately if settings say so
+            onClick(null, BUTTON_POSITIVE);
+            dismiss();
+        }
     }
 
     void createDialog() {