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

Commit cb267885 authored by Weng Su's avatar Weng Su
Browse files

Fixed progress bar display issue in Internet Dialog 

- Turn off progress bar when Wi-Fi is off

Bug: 393162738
Flag: EXEMPT bugfix
Test: Manual testing
  atest SystemUITests:InternetDialogDelegateLegacyTest
Change-Id: I915ddcb98474287900a998873cc0de46010941e6
parent 7d96d0a4

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -401,6 +401,9 @@ public class InternetDialogDelegateLegacy implements 




        mInternetDialogTitle.setText(internetContent.mInternetDialogTitleString);

        mInternetDialogTitle.setText(internetContent.mInternetDialogTitleString);

        mInternetDialogSubTitle.setText(internetContent.mInternetDialogSubTitle);

        mInternetDialogSubTitle.setText(internetContent.mInternetDialogSubTitle);

        if (!internetContent.mIsWifiEnabled) {

            setProgressBarVisible(false);

        }

        mAirplaneModeButton.setVisibility(

        mAirplaneModeButton.setVisibility(

                internetContent.mIsAirplaneModeEnabled ? View.VISIBLE : View.GONE);

                internetContent.mIsAirplaneModeEnabled ? View.VISIBLE : View.GONE);

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacyTest.java

+14 −0
Original line number Original line Diff line number Diff line
@@ -878,4 +878,18 @@ public class InternetDialogDelegateLegacyTest extends SysuiTestCase { 
        mMobileDataLayout.setVisibility(mobileDataVisible ? View.VISIBLE : View.GONE);

        mMobileDataLayout.setVisibility(mobileDataVisible ? View.VISIBLE : View.GONE);

        mConnectedWifi.setVisibility(connectedWifiVisible ? 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();

                });

    }

}
 
}