Merge "[Provider Model] Do not set mobile state repeatedly" into tm-qpr-dev (7b802157) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -363,6 +363,9 @@ public class InternetDialog extends SystemUIDialog implements
	if (!isChecked && shouldShowMobileDialog()) {		if (!isChecked && shouldShowMobileDialog()) {
	showTurnOffMobileDialog();		showTurnOffMobileDialog();
	} else if (!shouldShowMobileDialog()) {		} else if (!shouldShowMobileDialog()) {
			if (mInternetDialogController.isMobileDataEnabled() == isChecked) {
			return;
			}
	mInternetDialogController.setMobileDataEnabled(mContext, mDefaultDataSubId,		mInternetDialogController.setMobileDataEnabled(mContext, mDefaultDataSubId,
	isChecked, false);		isChecked, false);
	}		}

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java

+34 −8

Original line number	Original line	Diff line number	Diff line
	@@ -84,7 +84,8 @@ public class InternetDialogTest extends SysuiTestCase {
	private View mDialogView;		private View mDialogView;
	private View mSubTitle;		private View mSubTitle;
	private LinearLayout mEthernet;		private LinearLayout mEthernet;
	private LinearLayout mMobileDataToggle;		private LinearLayout mMobileDataLayout;
			private Switch mMobileToggleSwitch;
	private LinearLayout mWifiToggle;		private LinearLayout mWifiToggle;
	private Switch mWifiToggleSwitch;		private Switch mWifiToggleSwitch;
	private TextView mWifiToggleSummary;		private TextView mWifiToggleSummary;
	@@ -133,7 +134,8 @@ public class InternetDialogTest extends SysuiTestCase {
	mDialogView = mInternetDialog.mDialogView;		mDialogView = mInternetDialog.mDialogView;
	mSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle);		mSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle);
	mEthernet = mDialogView.requireViewById(R.id.ethernet_layout);		mEthernet = mDialogView.requireViewById(R.id.ethernet_layout);
	mMobileDataToggle = mDialogView.requireViewById(R.id.mobile_network_layout);		mMobileDataLayout = mDialogView.requireViewById(R.id.mobile_network_layout);
			mMobileToggleSwitch = mDialogView.requireViewById(R.id.mobile_toggle);
	mWifiToggle = mDialogView.requireViewById(R.id.turn_on_wifi_layout);		mWifiToggle = mDialogView.requireViewById(R.id.turn_on_wifi_layout);
	mWifiToggleSwitch = mDialogView.requireViewById(R.id.wifi_toggle);		mWifiToggleSwitch = mDialogView.requireViewById(R.id.wifi_toggle);
	mWifiToggleSummary = mDialogView.requireViewById(R.id.wifi_toggle_summary);		mWifiToggleSummary = mDialogView.requireViewById(R.id.wifi_toggle_summary);
	@@ -234,7 +236,7 @@ public class InternetDialogTest extends SysuiTestCase {

	mInternetDialog.updateDialog(true);		mInternetDialog.updateDialog(true);

	assertThat(mMobileDataToggle.getVisibility()).isEqualTo(View.GONE);		assertThat(mMobileDataLayout.getVisibility()).isEqualTo(View.GONE);
	}		}

	@Test		@Test
	@@ -246,7 +248,7 @@ public class InternetDialogTest extends SysuiTestCase {

	mInternetDialog.updateDialog(true);		mInternetDialog.updateDialog(true);

	assertThat(mMobileDataToggle.getVisibility()).isEqualTo(View.GONE);		assertThat(mMobileDataLayout.getVisibility()).isEqualTo(View.GONE);

	// Carrier network should be visible if airplane mode ON and Wi-Fi is ON.		// Carrier network should be visible if airplane mode ON and Wi-Fi is ON.
	when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);		when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);
	@@ -255,7 +257,7 @@ public class InternetDialogTest extends SysuiTestCase {

	mInternetDialog.updateDialog(true);		mInternetDialog.updateDialog(true);

	assertThat(mMobileDataToggle.getVisibility()).isEqualTo(View.VISIBLE);		assertThat(mMobileDataLayout.getVisibility()).isEqualTo(View.VISIBLE);
	}		}

	@Test		@Test
	@@ -265,7 +267,7 @@ public class InternetDialogTest extends SysuiTestCase {

	mInternetDialog.updateDialog(true);		mInternetDialog.updateDialog(true);

	assertThat(mMobileDataToggle.getVisibility()).isEqualTo(View.GONE);		assertThat(mMobileDataLayout.getVisibility()).isEqualTo(View.GONE);
	}		}

	@Test		@Test
	@@ -277,7 +279,7 @@ public class InternetDialogTest extends SysuiTestCase {

	mInternetDialog.updateDialog(true);		mInternetDialog.updateDialog(true);

	assertThat(mMobileDataToggle.getVisibility()).isEqualTo(View.VISIBLE);		assertThat(mMobileDataLayout.getVisibility()).isEqualTo(View.VISIBLE);
	assertThat(mAirplaneModeSummaryText.getVisibility()).isEqualTo(View.VISIBLE);		assertThat(mAirplaneModeSummaryText.getVisibility()).isEqualTo(View.VISIBLE);
	}		}

	@@ -313,6 +315,30 @@ public class InternetDialogTest extends SysuiTestCase {
	assertThat(mAirplaneModeSummaryText.getVisibility()).isEqualTo(View.GONE);		assertThat(mAirplaneModeSummaryText.getVisibility()).isEqualTo(View.GONE);
	}		}

			@Test
			public void updateDialog_mobileDataIsEnabled_checkMobileDataSwitch() {
			doReturn(true).when(mInternetDialogController).hasActiveSubId();
			when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);
			when(mInternetDialogController.isMobileDataEnabled()).thenReturn(true);
			mMobileToggleSwitch.setChecked(false);

			mInternetDialog.updateDialog(true);

			assertThat(mMobileToggleSwitch.isChecked()).isTrue();
			}

			@Test
			public void updateDialog_mobileDataIsNotChanged_checkMobileDataSwitch() {
			doReturn(true).when(mInternetDialogController).hasActiveSubId();
			when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);
			when(mInternetDialogController.isMobileDataEnabled()).thenReturn(false);
			mMobileToggleSwitch.setChecked(false);

			mInternetDialog.updateDialog(true);

			assertThat(mMobileToggleSwitch.isChecked()).isFalse();
			}

	@Test		@Test
	public void updateDialog_wifiOnAndHasInternetWifi_showConnectedWifi() {		public void updateDialog_wifiOnAndHasInternetWifi_showConnectedWifi() {
	mInternetDialog.dismissDialog();		mInternetDialog.dismissDialog();
	@@ -694,7 +720,7 @@ public class InternetDialogTest extends SysuiTestCase {
	private void setNetworkVisible(boolean ethernetVisible, boolean mobileDataVisible,		private void setNetworkVisible(boolean ethernetVisible, boolean mobileDataVisible,
	boolean connectedWifiVisible) {		boolean connectedWifiVisible) {
	mEthernet.setVisibility(ethernetVisible ? View.VISIBLE : View.GONE);		mEthernet.setVisibility(ethernetVisible ? View.VISIBLE : View.GONE);
	mMobileDataToggle.setVisibility(mobileDataVisible ? View.VISIBLE : View.GONE);		mMobileDataLayout.setVisibility(mobileDataVisible ? View.VISIBLE : View.GONE);
	mConnectedWifi.setVisibility(connectedWifiVisible ? View.VISIBLE : View.GONE);		mConnectedWifi.setVisibility(connectedWifiVisible ? View.VISIBLE : View.GONE);
	}		}
	}		}