am d0e1c273: am 279c1e15: am d0de39e7: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev

* commit 'd0e1c273dbf9518b84a0a6f8bdcaa14f13246110':
  Revert "Accessibility: filter touches to Enable button"
This commit is contained in:
Kenny Root
2013-11-06 15:17:49 -08:00
committed by Android Git Automerger

View File

@@ -159,7 +159,7 @@ public class ToggleAccessibilityServicePreferenceFragment
if (info == null) {
return null;
}
AlertDialog ad = new AlertDialog.Builder(getActivity())
return new AlertDialog.Builder(getActivity())
.setTitle(getString(R.string.enable_service_title,
info.getResolveInfo().loadLabel(getPackageManager())))
.setIconAttribute(android.R.attr.alertDialogIcon)
@@ -168,9 +168,6 @@ 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;