commit 6766f8f9bea33f303712cb20c98d8f3e7ff989f7
author Joshua Lambert <joshualambert@google.com> Mon Jun 19 17:09:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 19 17:09:19 2017 +0000
tree a79c55ac0ebe6599a90de1ad748e6ec53b185433
parent 5e2b7f15e8b178700fcbf3ec629a222b0d3d04a8
parent fd3fb0cafb480d7681afbd587763316d595f5bf0

Merge "Remove title change for IME steps" into oc-dev
am: fd3fb0cafb

Change-Id: I99d7e9b8f49b70532632b9e13887c75a418e1fe0

Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java

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 0b9594a..4d8d876 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
@@ -581,7 +581,6 @@
             case CONNECT:
             case CONNECT_FAILED:
             case CONNECT_TIMEOUT:
-            case ENTER_PASSWORD:
             case KNOWN_NETWORK:
             case SAVE:
             case SAVE_FAILED:
@@ -593,6 +592,14 @@
                 // talkback from announcing a misplaced title.
                 setTitle("");
                 return;
+            case ENTER_PASSWORD:
+                // IME screen; Let the IME handle announcements.
+                setTitle("");
+                return;
+            case ENTER_SSID:
+                // IME screen; Let the IME handle announcements.
+                setTitle("");
+                return;
             default:
                 setTitle(getResources().getString(pageType.getTitleResourceId()));
                 break;