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

Browse Source
This commit is contained in:
Zoey Chen
2021-12-10 14:08:50 +00:00
committed by Android (Google) Code Review
parent 8cb200a217 c350b0492d
commit 8758ec1469
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) { if (DEBUG) {
Log.d(TAG, "updateDialog"); Log.d(TAG, "updateDialog");
} }
if (mInternetDialogController.isAirplaneModeEnabled()) { mInternetDialogTitle.setText(getDialogTitleText());
mInternetDialogSubTitle.setVisibility(View.GONE); mInternetDialogSubTitle.setText(getSubtitleText());
mAirplaneModeLayout.setVisibility(View.VISIBLE); mAirplaneModeLayout.setVisibility(
} else { mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE);
mInternetDialogTitle.setText(getDialogTitleText());
mInternetDialogSubTitle.setVisibility(View.VISIBLE);
mInternetDialogSubTitle.setText(getSubtitleText());
mAirplaneModeLayout.setVisibility(View.GONE);
}
updateEthernet(); updateEthernet();
if (shouldUpdateMobileNetwork) { if (shouldUpdateMobileNetwork) {
setMobileDataLayout(mInternetDialogController.activeNetworkIsCellular(), 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); mInternetDialog.updateDialog(true);
assertThat(mSubTitle.getVisibility()).isEqualTo(View.GONE); assertThat(mSubTitle.getVisibility()).isEqualTo(View.VISIBLE);
} }
@Test @Test