Merge "Fixed progress bar display issue in Internet details view" into main (7da17cf0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManager.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,10 @@ constructor(
		title = getTitleText()
		subTitle = getSubtitleText()

		if (!internetContent.isWifiEnabled) {
		setProgressBarVisible(false)
		}

		airplaneModeButton.visibility =
		if (internetContent.isAirplaneModeEnabled) View.VISIBLE else View.GONE

+15 −0

Original line number	Diff line number	Diff line
		@@ -797,6 +797,21 @@ class InternetDetailsContentManagerTest : SysuiTestCase() {
		}
		}

		@Test
		fun turnOffProgressBarWhenWifiDisabled() {
		whenever(internetDetailsContentController.isWifiEnabled).thenReturn(false)
		internetDetailsContentManager.isProgressBarVisible = true

		internetDetailsContentManager.updateContent(false)

		bgExecutor.runAllReady()
		internetDetailsContentManager.internetContentData.observe(
		internetDetailsContentManager.lifecycleOwner!!
		) {
		assertThat(internetDetailsContentManager.isProgressBarVisible).isFalse()
		}
		}

		companion object {
		private const val TITLE = "Internet"
		private const val MOBILE_NETWORK_TITLE = "Mobile Title"