commit 6030f64a5837e68738deaac480be295e939b4cf9
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 01 06:36:19 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 01 06:36:19 2016 +0000
tree bc949f07e052f3545cd6db47c55f5c775a741f06
parent e972a23fafa385ebba4fec0ce9e689a1263b64e9
parent 3afce04bf8733e810b39e698a06c87bd9ecfd3cc

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 3f91293..2af3a89 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -509,6 +509,9 @@
     private static boolean isIntentAvailable(Context context) {
         String[] provisionApp = context.getResources().getStringArray(
                 com.android.internal.R.array.config_mobile_hotspot_provision_app);
+        if (provisionApp.length < 2) {
+            return false;
+        }
         final PackageManager packageManager = context.getPackageManager();
         Intent intent = new Intent(Intent.ACTION_MAIN);
         intent.setClassName(provisionApp[0], provisionApp[1]);

src/com/android/settings/widget/SwitchBar.java

diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index 95fd19a..240c062 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -341,6 +341,14 @@
         return Switch.class.getName();
     }
 
+    @Override
+    public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {
+        // Since the children are marked as not important for accessibility, re-dispatch all
+        // of their events as if they came from this view
+        event.setSource(this);
+        return true;
+    }
+
     /** @hide */
     @Override
     public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ec6ba85..7007d19 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -876,8 +876,19 @@
     }
 
     @Override
-    public void onAccessPointChanged(AccessPoint accessPoint) {
-        ((LongPressAccessPointPreference) accessPoint.getTag()).refresh();
+    public void onAccessPointChanged(final AccessPoint accessPoint) {
+        View view = getView();
+        if (view != null) {
+            view.post(new Runnable() {
+                @Override
+                public void run() {
+                    Object tag = accessPoint.getTag();
+                    if (tag != null) {
+                        ((LongPressAccessPointPreference) tag).refresh();
+                    }
+                }
+            });
+        }
     }
 
     @Override