Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5578c005 authored by Mike J. Chen's avatar Mike J. Chen Committed by Android Git Automerger
Browse files

am 31c5ec82: Allows auto dismissing of bluetooth activation dialogs 

* commit '31c5ec82':
  Allows auto dismissing of bluetooth activation dialogs
parents 31e80e7c 31c5ec82

res/values/bools.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>

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

+5 −0
Original line number Diff line number Diff line
@@ -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

+6 −0
Original line number Diff line number Diff line
@@ -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() {