Merge "[ProviderModel] Should no set the subtitle as gone when airplane mode is ON" into sc-v2-dev (8758ec14) · Commits · e / os / android_frameworks_base

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

+5 −9

Original line number	Diff line number	Diff line
		@@ -303,15 +303,11 @@ public class InternetDialog extends SystemUIDialog implements
		if (DEBUG) {
		Log.d(TAG, "updateDialog");
		}
		if (mInternetDialogController.isAirplaneModeEnabled()) {
		mInternetDialogSubTitle.setVisibility(View.GONE);
		mAirplaneModeLayout.setVisibility(View.VISIBLE);
		} else {
		mInternetDialogTitle.setText(getDialogTitleText());
		mInternetDialogSubTitle.setVisibility(View.VISIBLE);
		mInternetDialogSubTitle.setText(getSubtitleText());
		mAirplaneModeLayout.setVisibility(View.GONE);
		}
		mAirplaneModeLayout.setVisibility(
		mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE);

		updateEthernet();
		if (shouldUpdateMobileNetwork) {
		setMobileDataLayout(mInternetDialogController.activeNetworkIsCellular(),

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ public class InternetDialogTest extends SysuiTestCase {

		mInternetDialog.updateDialog(true);

		assertThat(mSubTitle.getVisibility()).isEqualTo(View.GONE);
		assertThat(mSubTitle.getVisibility()).isEqualTo(View.VISIBLE);
		}

		@Test