Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev

am: 4786291624

Change-Id: I6f3596bb4cde597c9fd72804432aa272504aff0e

res/layout/wifi_dialog.xml

@@ -21,6 +21,7 @@
         android:scrollIndicators="top|bottom">
 
     <LinearLayout
+            android:id="@+id/l_wifidialog"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"

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

@@ -363,6 +363,9 @@ public class WifiConfigController implements TextWatcher,
         if (mConfigUi.getSubmitButton() != null) {
             enableSubmitIfAppropriate();
         }
+
+        // After done view show and hide, request focus from parent view
+        mView.findViewById(R.id.l_wifidialog).requestFocus();
     }
 
     @VisibleForTesting

tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java

@@ -230,6 +230,22 @@ public class WifiConfigControllerTest {
         // No Crash
     }
 
+    @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();
+    }
+
+    @Test
+    public void passwordGetFocus_connectSecureWifi_shouldReturnTrue() {
+        final TextView password = mView.findViewById(R.id.password);
+        // Verify password get focus when connect to secure wifi without eap type
+        assertThat(password.isFocused()).isTrue();
+    }
+
     public class TestWifiConfigController extends WifiConfigController {
 
         private TestWifiConfigController(