From 04ec0e0929eb0bf7423d8d1d3c52e021beeeb711 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Wed, 12 May 2021 10:41:15 +0800 Subject: [PATCH] [Provider Model] Show searching sub-title only when the Wi-Fi network is empty - Screenshot: https://screenshot.googleplex.com/7Z5r5AnpAZb6GfQ Bug: 187886636 Test: manual test atest -c InternetConnectivityPanelTest Change-Id: Ib4769746819a5863e4a4981d0c73dda838ae3ae2 --- .../settings/panel/InternetConnectivityPanel.java | 12 +++++++----- .../panel/InternetConnectivityPanelTest.java | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/panel/InternetConnectivityPanel.java b/src/com/android/settings/panel/InternetConnectivityPanel.java index d057e2fe697..163afa10a19 100644 --- a/src/com/android/settings/panel/InternetConnectivityPanel.java +++ b/src/com/android/settings/panel/InternetConnectivityPanel.java @@ -322,11 +322,13 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve final List wifiList = mWifiManager.getScanResults(); if (wifiList != null && wifiList.size() != 0) { - if (mIsProgressBarVisible) { - // When the Wi-Fi scan result callback is received - // Sub-Title: Searching for networks... - mSubtitle = SUBTITLE_TEXT_SEARCHING_FOR_NETWORKS; - } + return; + } + + if (mIsProgressBarVisible) { + // When the Wi-Fi scan result callback is received + // Sub-Title: Searching for networks... + mSubtitle = SUBTITLE_TEXT_SEARCHING_FOR_NETWORKS; return; } diff --git a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java index d2ef4519b63..5ee2cc96daa 100644 --- a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java +++ b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java @@ -360,7 +360,6 @@ public class InternetConnectivityPanelTest { assertThat(mPanel.isProgressBarVisible()).isTrue(); verify(mPanelContentCallback).onProgressBarVisibleChanged(); - verify(mPanelContentCallback).onHeaderChanged(); verify(mMainThreadHandler).postDelayed(any() /* mHideProgressBarRunnable */, anyLong()); }