Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev (5d02b8b8) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -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