PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 9ec08d65c5 d0e1c273db
commit 856c998aab
1 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

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