Merge "[Wi-Fi] Fix check mark button when edit the password of a secured network." into rvc-dev am: a802eba9b8 am: 202e028212 am: 42b9886a66

Change-Id: I3a076754976de779157c3390960b218527a08259

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

@@ -27,12 +27,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settingslib.wifi.AccessPoint;
 
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Detail page for configuring Wi-Fi network.
  *
@@ -113,7 +113,7 @@ public class ConfigureAccessPointFragment extends InstrumentedFragment implement
 
     @Override
     public void dispatchSubmit() {
-        // Do nothing
+        handleSubmitAction();
     }
 
     @Override

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

@@ -148,7 +148,7 @@ public class ConfigureWifiEntryFragment extends InstrumentedFragment implements
 
     @Override
     public void dispatchSubmit() {
-        // Do nothing
+        handleSubmitAction();
     }
 
     @Override

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

@@ -84,6 +84,13 @@ public class ConfigureAccessPointFragmentTest {
         verify(mConfigureAccessPointFragment).handleSubmitAction();
     }
 
+    @Test
+    public void dispatchSubmit_shouldHandleSubmitAction() {
+        mConfigureAccessPointFragment.dispatchSubmit();
+
+        verify(mConfigureAccessPointFragment).handleSubmitAction();
+    }
+
     @Test
     public void onClickCancelButton_shouldHandleCancelAction() {
         mConfigureAccessPointFragment.getCancelButton().performClick();

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

@@ -88,6 +88,13 @@ public class ConfigureWifiEntryFragmentTest {
         verify(mConfigureWifiEntryFragment).handleSubmitAction();
     }
 
+    @Test
+    public void dispatchSubmit_shouldHandleSubmitAction() {
+        mConfigureWifiEntryFragment.dispatchSubmit();
+
+        verify(mConfigureWifiEntryFragment).handleSubmitAction();
+    }
+
     @Test
     public void onClickCancelButton_shouldHandleCancelAction() {
         mConfigureWifiEntryFragment.getCancelButton().performClick();