Merge "Update the toggle state in constructor." into pi-dev (5cafb0b5) · Commits · e / os / android_packages_apps_Settings

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS
		mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
		mSwitchBar.setChecked(mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED);
		mSwitchBar.setListener(this);
		updateWifiSwitch();
		}

		@Override
		@@ -103,7 +104,7 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS
		WifiManager.EXTRA_WIFI_AP_STATE, WifiManager.WIFI_AP_STATE_FAILED);
		handleWifiApStateChanged(state);
		} else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {
		enableWifiSwitch();
		updateWifiSwitch();
		}
		}
		};
		@@ -117,7 +118,7 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS
		if (!mSwitchBar.isChecked()) {
		mSwitchBar.setChecked(true);
		}
		enableWifiSwitch();
		updateWifiSwitch();
		break;
		case WifiManager.WIFI_AP_STATE_DISABLING:
		if (mSwitchBar.isChecked()) {
		@@ -127,16 +128,16 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS
		break;
		case WifiManager.WIFI_AP_STATE_DISABLED:
		mSwitchBar.setChecked(false);
		enableWifiSwitch();
		updateWifiSwitch();
		break;
		default:
		mSwitchBar.setChecked(false);
		enableWifiSwitch();
		updateWifiSwitch();
		break;
		}
		}

		private void enableWifiSwitch() {
		private void updateWifiSwitch() {
		boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
		if (!isAirplaneMode) {

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

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.wifi.tether;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.net.wifi.WifiManager;
		import android.provider.Settings;

		import com.android.settings.testutils.SettingsRobolectricTestRunner;
		import com.android.settings.widget.SwitchBar;
		import com.android.settings.widget.SwitchBarController;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RuntimeEnvironment;

		@RunWith(SettingsRobolectricTestRunner.class)
		public class WifiTetherSwitchBarControllerTest {
		@Mock
		private WifiManager mWifiManager;

		private Context mContext;
		private SwitchBar mSwitchBar;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);

		mContext = spy(RuntimeEnvironment.application);
		mSwitchBar = new SwitchBar(mContext);
		when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
		}

		@Test
		public void testConstructor_airplaneModeOn_switchBarDisabled() {
		Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
		Settings.Global.AIRPLANE_MODE_ON, 1);

		final WifiTetherSwitchBarController controller = new WifiTetherSwitchBarController(
		mContext, new SwitchBarController(mSwitchBar));

		assertThat(mSwitchBar.isEnabled()).isFalse();
		}
		}