From 35c14a2ac3d1d0e1e640556e03c084290c97d581 Mon Sep 17 00:00:00 2001 From: Yuchen Chang Date: Tue, 13 Mar 2018 05:26:47 +0000 Subject: [PATCH] Revert "[Settings] Request focus in Add network dialog" This reverts commit 49d314f8c35e1a6d26c50014cb6faeb817d27b9b. Reason for revert: Revert for proper fix in pi-dev branch. Solution in http://ag/3714337 is proper fix to make all case in wifi dialog can get focus. Change-Id: I99035a4c437ea6c033e3ba6a83e39967c236d973 --- src/com/android/settings/wifi/WifiConfigController.java | 1 - .../android/settings/wifi/WifiConfigControllerTest.java | 9 --------- 2 files changed, 10 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 1e326b84ece..d7b42996308 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -215,7 +215,6 @@ public class WifiConfigController implements TextWatcher, mSsidView = (TextView) mView.findViewById(R.id.ssid); mSsidView.addTextChangedListener(this); - mSsidView.requestFocus(); mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security)); mSecuritySpinner.setOnItemSelectedListener(this); mView.findViewById(R.id.type).setVisibility(View.VISIBLE); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java index e5c71449c92..bbe104c1641 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java @@ -210,15 +210,6 @@ public class WifiConfigControllerTest { assertThat(mView.findViewById(R.id.eap).getVisibility()).isEqualTo(View.GONE); } - @Test - public void ssidGetFocus_addNewNetwork_shouldReturnTrue() { - mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */, - WifiConfigUiBase.MODE_CONNECT); - final TextView ssid = mView.findViewById(R.id.ssid); - // Verify ssid text get focus when add new network (accesspoint is null) - assertThat(ssid.isFocused()).isTrue(); - } - public class TestWifiConfigController extends WifiConfigController { private TestWifiConfigController(