Merge "[DO NOT MERGE] Update Talkback content for setup transitions" into nyc-mr2-dev

2 files changed, 36 insertions, 0 deletions

diff --git a/Settings/src/com/android/tv/settings/connectivity/WpsConnectionActivity.java b/Settings/src/com/android/tv/settings/connectivity/WpsConnectionActivity.java
index ea089aa47..840c99283 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WpsConnectionActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WpsConnectionActivity.java
@@ -99,6 +99,10 @@ public class WpsConnectionActivity extends DialogActivity
         setLayoutProperties(R.layout.setup_auth_activity, R.id.description, R.id.action);
         super.onCreate(savedInstanceState);
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+
+        if (ThemeHelper.fromSetupWizard(getIntent())) {
+            setTitle(getResources().getString(R.string.wifi_wps_title));
+        }
     }
 
     @Override
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java b/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
index ccad5e104..38f864cd4 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
@@ -34,6 +34,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Pair;
+import android.view.accessibility.AccessibilityEvent;
 
 import com.android.settingslib.wifi.WifiTracker;
 import com.android.tv.settings.R;
@@ -382,6 +383,9 @@ public class WifiSetupActivity extends WifiMultiPagedFormActivity
                 mWifiTracker.resumeScanning();
             }
         }
+        if (ThemeHelper.fromSetupWizard(getIntent())) {
+            updateTitle(formPageType);
+        }
     }
 
     @Override
@@ -532,4 +536,32 @@ public class WifiSetupActivity extends WifiMultiPagedFormActivity
             addPage(WifiFormPageType.SUMMARY_NOT_CONNECTED);
         }
     }
+
+    private void updateTitle(WifiFormPageType pageType) {
+        switch (pageType) {
+            // Fall through for all pageTypes that require the SSID of the network for
+            // the title.
+            case ADVANCED_OPTIONS:
+            case CONNECT:
+            case CONNECT_FAILED:
+            case CONNECT_TIMEOUT:
+            case ENTER_PASSWORD:
+            case KNOWN_NETWORK:
+            case SAVE:
+            case SAVE_FAILED:
+                setTitle(getResources().getString(pageType.getTitleResourceId(),
+                        mConfiguration.getPrintableSsid()));
+                break;
+            case WPS:
+                // Delegate title to the WPSConnectionActivity. Use blank string to prevent
+                // talkback from announcing a misplaced title.
+                setTitle("");
+                return;
+            default:
+                setTitle(getResources().getString(pageType.getTitleResourceId()));
+                break;
+        }
+        getWindow().getDecorView()
+                .sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
+    }
 }