diff options
| -rw-r--r-- | res/values/bools.xml | 4 | ||||
| -rw-r--r-- | src/com/android/settings/bluetooth/RequestPermissionActivity.java | 5 | ||||
| -rw-r--r-- | src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/res/values/bools.xml b/res/values/bools.xml index 278859b..2d05fbf 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -25,4 +25,8 @@ <!-- Display additional System Update menu if true --> <bool name="config_additional_system_update_setting_enable">false</bool> + + <!-- Whether the bluetooth activation confirmation dialogs should be auto dismissed. + Can be overridden for specific product builds. --> + <bool name="auto_confirm_bluetooth_activation_dialog">false</bool> </resources> diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java index 07a7316..529312d 100644 --- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java +++ b/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 diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java index 9b5946b..5c4b828 100644 --- a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java +++ b/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() { |