Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1bfc7da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev

parents 0d00ace0 04ec0e09

src/com/android/settings/panel/InternetConnectivityPanel.java

+7 −5
Original line number Diff line number Diff line
@@ -322,11 +322,13 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve 


        final List<ScanResult> wifiList = mWifiManager.getScanResults();

        if (wifiList != null && wifiList.size() != 0) {

            return;

        }



        if (mIsProgressBarVisible) {

            // When the Wi-Fi scan result callback is received

            //   Sub-Title: Searching for networks...

            mSubtitle = SUBTITLE_TEXT_SEARCHING_FOR_NETWORKS;

            }

            return;

        }

tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java

+0 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ public class InternetConnectivityPanelTest { 


        assertThat(mPanel.isProgressBarVisible()).isTrue();

        verify(mPanelContentCallback).onProgressBarVisibleChanged();

        verify(mPanelContentCallback).onHeaderChanged();

        verify(mMainThreadHandler).postDelayed(any() /* mHideProgressBarRunnable */, anyLong());

    }