diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java | 14 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java index e3f085cfbe36..2a398496af77 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java @@ -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(), diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java index 651bcdef9978..89537884903a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java @@ -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 |