diff options
| author | Joshua Lambert <joshualambert@google.com> | 2017-06-19 16:54:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-19 16:54:34 +0000 |
| commit | fd3fb0cafb480d7681afbd587763316d595f5bf0 (patch) | |
| tree | 46b79ae328331074dbef9db41c50676caeaf503b | |
| parent | 40609a57f18593f1eafe0a0c8837cc01948711ee (diff) | |
| parent | 6ca8f149173499b40938aef953d97dee96ea1535 (diff) | |
| download | platform_packages_apps_TvSettings-oreo-dev.tar.gz platform_packages_apps_TvSettings-oreo-dev.tar.bz2 platform_packages_apps_TvSettings-oreo-dev.zip | |
Merge "Remove title change for IME steps" into oc-devoreo-dev
| -rw-r--r-- | Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java | 9 |
1 files changed, 8 insertions, 1 deletions
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 0b9594a5e..4d8d876d2 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 @@ public class WifiSetupActivity extends WifiMultiPagedFormActivity case CONNECT: case CONNECT_FAILED: case CONNECT_TIMEOUT: - case ENTER_PASSWORD: case KNOWN_NETWORK: case SAVE: case SAVE_FAILED: @@ -593,6 +592,14 @@ public class WifiSetupActivity extends WifiMultiPagedFormActivity // 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; |