From 539211a718125cc894b81ccbb9e5d1f9364912b5 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Mon, 5 Jun 2017 16:30:37 +0900 Subject: [PATCH] Instrument sign-in-captive-portal button Bug: 36203355 Bug: 34901696 Bug: 36532213 Test: WifiDetailPreferenceControllerTest updated Change-Id: I03dbcdd6efbd0d7aaf2ef67d541fceeb6acc2acf --- .../wifi/details/WifiDetailPreferenceController.java | 12 ++++++++++-- .../wifi/details/WifiDetailPreferenceControllerTest.java | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index 15308e179e..4ab0805d15 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -247,8 +247,7 @@ public class WifiDetailPreferenceController extends PreferenceController impleme mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF); mSignInButton = (Button) mButtonsPref.findViewById(R.id.signin_button); mSignInButton.setText(R.string.support_sign_in_button_text); - mSignInButton.setOnClickListener( - view -> mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork)); + mSignInButton.setOnClickListener(view -> signIntoNetwork()); mSignalStrengthPref = (WifiDetailPreference) screen.findPreference(KEY_SIGNAL_STRENGTH_PREF); @@ -477,4 +476,13 @@ public class WifiDetailPreferenceController extends PreferenceController impleme mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_FORGET); mFragment.getActivity().finish(); } + + /** + * Sign in to the captive portal found on this wifi network associated with this preference. + */ + private void signIntoNetwork() { + mMetricsFeatureProvider.action( + mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN); + mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork); + } } diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 43177f7898..0839d8b7f7 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -715,6 +715,8 @@ public class WifiDetailPreferenceControllerTest { verify(mockSignInButton).setOnClickListener(captor.capture()); captor.getValue().onClick(mockSignInButton); verify(mockConnectivityManagerWrapper).startCaptivePortalApp(mockNetwork); + verify(mockMetricsFeatureProvider) + .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN); } @Test -- 2.11.0