commit 1bfd35410db22b1f4aabe4ad3f471bedb088584d
author Baligh Uddin <baligh@google.com> Tue Nov 05 23:12:13 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 05 23:12:13 2013 +0000
tree e712e05872daec3f1ef4e3a77a8a000618750562
parent 060d5fd1727b087094e295481b2633deb33a6616
parent 734def9d81c069c509efacc474abe41c0cda769e

Merge "Import translations. DO NOT MERGE" into klp-dev

res/values/dimens.xml

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index bf697d6..1294483 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -50,7 +50,7 @@
 
     <!--  Size of icons in the top-level of settings  -->
     <dimen name="header_icon_width">28dp</dimen>
-    <dimen name="appwidget_min_width">260dip</dimen>
+    <dimen name="appwidget_min_width">280dip</dimen>
     <dimen name="appwidget_min_height">40dip</dimen>
 
     <dimen name="pager_tabs_padding">0dp</dimen>

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 0c568f0..f097fd6 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -154,41 +154,44 @@
     public Dialog onCreateDialog(int dialogId) {
         switch (dialogId) {
             case DIALOG_ID_ENABLE_WARNING: {
-            mShownDialogId = DIALOG_ID_ENABLE_WARNING;
-            AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-            if (info == null) {
-                return null;
+                mShownDialogId = DIALOG_ID_ENABLE_WARNING;
+                AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+                if (info == null) {
+                    return null;
+                }
+                AlertDialog ad = new AlertDialog.Builder(getActivity())
+                        .setTitle(getString(R.string.enable_service_title,
+                                info.getResolveInfo().loadLabel(getPackageManager())))
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
+                        .setView(createEnableDialogContentView(info))
+                        .setCancelable(true)
+                        .setPositiveButton(android.R.string.ok, this)
+                        .setNegativeButton(android.R.string.cancel, this)
+                        .create();
+                ad.getButton(AlertDialog.BUTTON_POSITIVE)
+                        .setFilterTouchesWhenObscured(true);
+                return ad;
             }
-            return new AlertDialog.Builder(getActivity())
-            .setTitle(getString(R.string.enable_service_title,
-                    info.getResolveInfo().loadLabel(getPackageManager())))
-                    .setIconAttribute(android.R.attr.alertDialogIcon)
-                    .setView(createEnableDialogContentView(info))
-                    .setCancelable(true)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setNegativeButton(android.R.string.cancel, this)
-                    .create();
-        }
             case DIALOG_ID_DISABLE_WARNING: {
-            mShownDialogId = DIALOG_ID_DISABLE_WARNING;
-            AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-            if (info == null) {
-                return null;
+                mShownDialogId = DIALOG_ID_DISABLE_WARNING;
+                AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+                if (info == null) {
+                    return null;
+                }
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getString(R.string.disable_service_title,
+                                info.getResolveInfo().loadLabel(getPackageManager())))
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
+                        .setMessage(getString(R.string.disable_service_message,
+                                info.getResolveInfo().loadLabel(getPackageManager())))
+                        .setCancelable(true)
+                        .setPositiveButton(android.R.string.ok, this)
+                        .setNegativeButton(android.R.string.cancel, this)
+                        .create();
             }
-            return new AlertDialog.Builder(getActivity())
-            .setTitle(getString(R.string.disable_service_title,
-                    info.getResolveInfo().loadLabel(getPackageManager())))
-                    .setIconAttribute(android.R.attr.alertDialogIcon)
-                    .setMessage(getString(R.string.disable_service_message,
-                            info.getResolveInfo().loadLabel(getPackageManager())))
-                    .setCancelable(true)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setNegativeButton(android.R.string.cancel, this)
-                    .create();
-        }
             default: {
-            throw new IllegalArgumentException();
-        }
+                throw new IllegalArgumentException();
+            }
         }
     }