Merge cherrypicks of [2910953, 2911031, 2908688] into oc-mr1-release (d2f9dedd) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,8 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController
		private void handleWifiApStateChanged(int state, int reason) {
		switch (state) {
		case WifiManager.WIFI_AP_STATE_ENABLING:
		mPreference.setSummary(R.string.wifi_tether_starting);
		break;
		case WifiManager.WIFI_AP_STATE_ENABLED:
		/**
		* Summary on enable is handled by tether

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java

+14 −5

Original line number	Diff line number	Diff line
		@@ -175,20 +175,29 @@ public class WifiTetherPreferenceControllerTest {
		}

		@Test
		public void testReceiver_apStateChangedToEnablingOrEnabled_shouldNotUpdatePreferenceSummary() {
		public void testReceiver_apStateChangedToEnabling_shouldUpdatePreferenceSummary() {
		mController.displayPreference(mScreen);
		receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLING);
		assertThat(mPreference.getSummary().toString()).isEqualTo(
		RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));
		}

		@Test
		public void testReceiver_apStateChangedToEnabled_shouldNotUpdatePreferenceSummary() {
		mController.displayPreference(mScreen);
		receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_DISABLED);
		assertThat(mPreference.getSummary().toString()).isEqualTo(
		RuntimeEnvironment.application.getString(R.string.wifi_hotspot_off_subtext));

		// When turning on the hotspot, we receive STATE_ENABLING followed by STATE_ENABLED. Neither
		// of these should change the summary.
		// When turning on the hotspot, we receive STATE_ENABLING followed by STATE_ENABLED. The
		// first should change the status to wifi_tether_starting, and the second should not change
		// this.
		receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLING);
		assertThat(mPreference.getSummary().toString()).isEqualTo(
		RuntimeEnvironment.application.getString(R.string.wifi_hotspot_off_subtext));
		RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));
		receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLED);
		assertThat(mPreference.getSummary().toString()).isEqualTo(
		RuntimeEnvironment.application.getString(R.string.wifi_hotspot_off_subtext));
		RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));
		}

		@Test