am 8f40097e: am 18964c90: am 8cc60da4: Merge "Accessibility: filter touches to Enable button" into klp-dev

* commit '8f40097e169232f9813ad3cf8e8e0a280106de16':
  Accessibility: filter touches to Enable button
This commit is contained in:
Kenny Root
2013-11-05 12:02:08 -08:00
committed by Android Git Automerger

View File

@@ -159,7 +159,7 @@ public class ToggleAccessibilityServicePreferenceFragment
if (info == null) {
return null;
}
return new AlertDialog.Builder(getActivity())
AlertDialog ad = new AlertDialog.Builder(getActivity())
.setTitle(getString(R.string.enable_service_title,
info.getResolveInfo().loadLabel(getPackageManager())))
.setIconAttribute(android.R.attr.alertDialogIcon)
@@ -168,6 +168,9 @@ public class ToggleAccessibilityServicePreferenceFragment
.setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this)
.create();
ad.getButton(AlertDialog.BUTTON_POSITIVE)
.setFilterTouchesWhenObscured(true);
return ad;
}
case DIALOG_ID_DISABLE_WARNING: {
mShownDialogId = DIALOG_ID_DISABLE_WARNING;