diff options
2 files changed, 17 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java index 0adc41313bae..8d4a24e0c2cf 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java @@ -400,6 +400,9 @@ public class InternetDialogDelegateLegacy implements mInternetDialogTitle.setText(internetContent.mInternetDialogTitleString); mInternetDialogSubTitle.setText(internetContent.mInternetDialogSubTitle); + if (!internetContent.mIsWifiEnabled) { + setProgressBarVisible(false); + } mAirplaneModeButton.setVisibility( internetContent.mIsAirplaneModeEnabled ? View.VISIBLE : View.GONE); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacyTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacyTest.java index 3d0a8f6cd236..ebbe023d0d24 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacyTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacyTest.java @@ -878,4 +878,18 @@ public class InternetDialogDelegateLegacyTest extends SysuiTestCase { mMobileDataLayout.setVisibility(mobileDataVisible ? View.VISIBLE : View.GONE); mConnectedWifi.setVisibility(connectedWifiVisible ? View.VISIBLE : View.GONE); } + + @Test + public void updateDialog_wifiIsDisabled_turnOffProgressBar() { + when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false); + mInternetDialogDelegateLegacy.mIsProgressBarVisible = true; + + mInternetDialogDelegateLegacy.updateDialog(false); + + mBgExecutor.runAllReady(); + mInternetDialogDelegateLegacy.mDataInternetContent.observe( + mInternetDialogDelegateLegacy.mLifecycleOwner, i -> { + assertThat(mInternetDialogDelegateLegacy.mIsProgressBarVisible).isFalse(); + }); + } } |