Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev (22f6857a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/panel/InternetConnectivityPanel.java

+5 −19

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import android.text.TextUtils;
		import android.util.Log;

		import androidx.annotation.VisibleForTesting;
		import androidx.fragment.app.FragmentActivity;
		import androidx.lifecycle.LifecycleObserver;
		import androidx.lifecycle.OnLifecycleEvent;

		@@ -236,29 +235,17 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve

		@Override
		public Intent getSeeMoreIntent() {
		// Disable the see more button for provider model design.
		if (mIsProviderModelEnabled) {
		return null;
		}

		// Don't remove the see more intent for non-provider model design. This intent will be
		// used when isCustomizedButtonUsed() returns false.
		return new Intent(Settings.ACTION_WIRELESS_SETTINGS)
		.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		}

		@Override
		public boolean isCustomizedButtonUsed() {
		return mIsProviderModelEnabled;
		}

		@Override
		public CharSequence getCustomizedButtonTitle() {
		return mContext.getText(
		mInternetUpdater.isWifiEnabled() ? R.string.turn_off_wifi : R.string.turn_on_wifi);
		}

		@Override
		public void onClickCustomizedButton(FragmentActivity panelActivity) {
		// Don't finish the panel activity
		mWifiManager.setWifiEnabled(!mInternetUpdater.isWifiEnabled());
		}

		@Override
		public boolean isProgressBarVisible() {
		return mIsProgressBarVisible;
		@@ -320,7 +307,6 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve
		}
		updateSubtitleText();
		mCallback.onHeaderChanged();
		mCallback.onCustomizedButtonStateChanged();
		}

		@VisibleForTesting

tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java

+6 −60

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
		import static org.mockito.Mockito.clearInvocations;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;
		@@ -32,7 +31,6 @@ import android.net.wifi.ScanResult;
		import android.net.wifi.WifiManager;
		import android.os.Handler;

		import androidx.fragment.app.FragmentActivity;
		import androidx.test.core.app.ApplicationProvider;
		import androidx.test.ext.junit.runners.AndroidJUnit4;

		@@ -89,8 +87,6 @@ public class InternetConnectivityPanelTest {
		private WifiManager mWifiManager;
		@Mock
		private ProviderModelSliceHelper mProviderModelSliceHelper;
		@Mock
		private FragmentActivity mPanelActivity;

		private Context mContext;
		private FakeHandlerInjector mFakeHandlerInjector;
		@@ -222,20 +218,6 @@ public class InternetConnectivityPanelTest {
		assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT);
		}

		@Test
		public void getCustomizedButtonTitle_wifiOff_turnOnWifi() {
		doReturn(false).when(mInternetUpdater).isWifiEnabled();

		assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_TURN_ON_WIFI);
		}

		@Test
		public void getCustomizedButtonTitle_wifiOn_turnOffWifi() {
		doReturn(true).when(mInternetUpdater).isWifiEnabled();

		assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_TURN_OFF_WIFI);
		}

		@Test
		public void getSlices_providerModelDisabled_containsNecessarySlices() {
		mPanel.mIsProviderModelEnabled = false;
		@@ -255,33 +237,17 @@ public class InternetConnectivityPanelTest {
		}

		@Test
		public void getSeeMoreIntent_shouldNotNull() {
		assertThat(mPanel.getSeeMoreIntent()).isNotNull();
		}

		@Test
		public void onClickCustomizedButton_wifiOn_setWifiOff() {
		doReturn(true).when(mInternetUpdater).isWifiEnabled();

		mPanel.onClickCustomizedButton(mPanelActivity);

		verify(mWifiManager).setWifiEnabled(false);
		}

		@Test
		public void onClickCustomizedButton_wifiOff_setWifiOn() {
		doReturn(false).when(mInternetUpdater).isWifiEnabled();

		mPanel.onClickCustomizedButton(mPanelActivity);
		public void getSeeMoreIntent_providerModelDisabled_shouldNotNull() {
		mPanel.mIsProviderModelEnabled = false;

		verify(mWifiManager).setWifiEnabled(true);
		assertThat(mPanel.getSeeMoreIntent()).isNotNull();
		}

		@Test
		public void onClickCustomizedButton_shouldNotFinishActivity() {
		mPanel.onClickCustomizedButton(mPanelActivity);
		public void getSeeMoreIntent_providerModelEnabled_shouldBeNull() {
		mPanel.mIsProviderModelEnabled = true;

		verify(mPanelActivity, never()).finish();
		assertThat(mPanel.getSeeMoreIntent()).isNull();
		}

		@Test
		@@ -293,26 +259,6 @@ public class InternetConnectivityPanelTest {
		verify(mPanelContentCallback).onHeaderChanged();
		}

		@Test
		public void onWifiEnabledChanged_wifiOff_onCustomizedButtonStateChanged() {
		doReturn(false).when(mInternetUpdater).isWifiEnabled();
		clearInvocations(mPanelContentCallback);

		mPanel.onWifiEnabledChanged(false);

		verify(mPanelContentCallback).onCustomizedButtonStateChanged();
		}

		@Test
		public void onWifiEnabledChanged_wifiOn_onCustomizedButtonStateChanged() {
		doReturn(true).when(mInternetUpdater).isWifiEnabled();
		clearInvocations(mPanelContentCallback);

		mPanel.onWifiEnabledChanged(true);

		verify(mPanelContentCallback).onCustomizedButtonStateChanged();
		}

		@Test
		public void updateProgressBar_wifiDisabled_hideProgress() {
		mPanel.mIsProgressBarVisible = true;