Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ProviderModel] Should no set the subtitle as gone when airplane mode is ON" into sc-v2-dev am: 8758ec1469

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16432820

Change-Id: I8d34264020981c0ca98550f6b7c3cf04a918d359
This commit is contained in:
Zoey Chen
2021-12-10 14:27:41 +00:00
committed by Automerger Merge Worker
parent 723f9d22c1 8758ec1469
commit 59b0e876d4
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
mInternetDialogTitle.setText(getDialogTitleText());
mInternetDialogSubTitle.setText(getSubtitleText());
mAirplaneModeLayout.setVisibility(
mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE);
updateEthernet();
if (shouldUpdateMobileNetwork) {
setMobileDataLayout(mInternetDialogController.activeNetworkIsCellular(),

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

@@ -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