commit ba35595d543bc715b3459855b1e22b25faa40aa5
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 14 11:13:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 11:14:00 2017 +0000
tree 513fee11dc6b9d0150114f5f27e8eb2dea14f8f9
parent cd79e3a785d90cffbaeafaf8c23b721a9f5d9583
parent 11bf78028ebd6e99b9b7b50f329a38b8f0a27f73

Merge "CredentialFragment anti-pocket dialing measures."

src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index a5f9830..40972ac 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -366,13 +366,22 @@
             }
         }
 
+        /**
+         * Dialog setup.
+         * <p>
+         * To make it less likely that the dialog is dismissed accidentally, for example if the
+         * device is malfunctioning or if the device is in a pocket, we set
+         * {@code setCanceledOnTouchOutside(false)}.
+         */
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
-            return new AlertDialog.Builder(getActivity())
+            Dialog dialog = new AlertDialog.Builder(getActivity())
                     .setTitle(getArguments().getString(ARG_TITLE))
                     .setMessage(getArguments().getInt(ARG_MESSAGE))
                     .setPositiveButton(getArguments().getInt(ARG_BUTTON), null)
                     .create();
+            dialog.setCanceledOnTouchOutside(false);
+            return dialog;
         }
 
         @Override