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

Commit 6665c4fc authored by Weng Su's avatar Weng Su Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Refine sub-title (QS Internet Dialog)" into sc-v2-dev... 

Merge "[Provider Model] Refine sub-title (QS Internet Dialog)" into sc-v2-dev am: a841c8a1 am: c446353f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16393101

Change-Id: I336f28d6812c704c656387f2ac4f25d31e0e8b90
parents ae65b977 c446353f

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

+4 −0
Original line number Diff line number Diff line
@@ -348,6 +348,10 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
            return mContext.getText(SUBTITLE_TEXT_SEARCHING_FOR_NETWORKS);

        }



        if (isCarrierNetworkActive()) {

            return mContext.getText(SUBTITLE_TEXT_NON_CARRIER_NETWORK_UNAVAILABLE);

        }



        // Sub-Title:

        // show non_carrier_network_unavailable

        //   - while Wi-Fi on + no Wi-Fi item

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

+11 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ public class InternetDialogControllerTest extends SysuiTestCase { 
        mAccessPoints.add(mWifiEntry1);

        when(mAccessPointController.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);

        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[]{SUB_ID});

        when(mAccessPointController.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);

        when(mToastFactory.createToast(any(), anyString(), anyString(), anyInt(), anyInt()))

            .thenReturn(mSystemUIToast);

        when(mSystemUIToast.getView()).thenReturn(mToastView);
@@ -334,6 +333,17 @@ public class InternetDialogControllerTest extends SysuiTestCase { 
                .isNotEqualTo(getResourcesString("non_carrier_network_unavailable"));

    }



    @Test

    public void getSubtitleText_withCarrierNetworkActiveOnly_returnNoOtherAvailable() {

        fakeAirplaneModeEnabled(false);

        when(mWifiManager.isWifiEnabled()).thenReturn(true);

        mInternetDialogController.onAccessPointsChanged(null /* accessPoints */);

        when(mMergedCarrierEntry.isDefaultNetwork()).thenReturn(true);



        assertThat(mInternetDialogController.getSubtitleText(false))

                .isEqualTo(getResourcesString("non_carrier_network_unavailable"));

    }



    @Test

    public void getWifiDetailsSettingsIntent_withNoKey_returnNull() {

        assertThat(mInternetDialogController.getWifiDetailsSettingsIntent(null)).isNull();