PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev

Browse Source
This commit is contained in:
Hugo Benichi
2017-06-09 08:56:17 +00:00
committed by Android (Google) Code Review
parent 8a241a438b 2c06009ad6
commit 5d02b8b85f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -247,8 +247,7 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF); mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);
mSignInButton = (Button) mButtonsPref.findViewById(R.id.signin_button); mSignInButton = (Button) mButtonsPref.findViewById(R.id.signin_button);
mSignInButton.setText(R.string.support_sign_in_button_text); mSignInButton.setText(R.string.support_sign_in_button_text);
mSignInButton.setOnClickListener( mSignInButton.setOnClickListener(view -> signIntoNetwork());
view -> mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork));
mSignalStrengthPref = mSignalStrengthPref =
(WifiDetailPreference) screen.findPreference(KEY_SIGNAL_STRENGTH_PREF); (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(), MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
mFragment.getActivity().finish(); 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);
}
} }

2
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -715,6 +715,8 @@ public class WifiDetailPreferenceControllerTest {
verify(mockSignInButton).setOnClickListener(captor.capture()); verify(mockSignInButton).setOnClickListener(captor.capture());
captor.getValue().onClick(mockSignInButton); captor.getValue().onClick(mockSignInButton);
verify(mockConnectivityManagerWrapper).startCaptivePortalApp(mockNetwork); verify(mockConnectivityManagerWrapper).startCaptivePortalApp(mockNetwork);
verify(mockMetricsFeatureProvider)
.action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
} }
@Test @Test