Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Id1c22b24883a0625b7db1350d61b2ed31e5f640b
This commit is contained in:
Weng Su
2021-12-08 03:59:44 +00:00
committed by Automerger Merge Worker
parent 70a599b11b a841c8a1d3
commit c446353f1c
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -348,6 +348,10 @@ public class InternetDialogController implements AccessPointController.AccessPoi
return mContext.getText(SUBTITLE_TEXT_SEARCHING_FOR_NETWORKS); return mContext.getText(SUBTITLE_TEXT_SEARCHING_FOR_NETWORKS);
} }
if (isCarrierNetworkActive()) {
return mContext.getText(SUBTITLE_TEXT_NON_CARRIER_NETWORK_UNAVAILABLE);
}
// Sub-Title: // Sub-Title:
// show non_carrier_network_unavailable // show non_carrier_network_unavailable
// - while Wi-Fi on + no Wi-Fi item // - while Wi-Fi on + no Wi-Fi item

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

@@ -159,7 +159,6 @@ public class InternetDialogControllerTest extends SysuiTestCase {
mAccessPoints.add(mWifiEntry1); mAccessPoints.add(mWifiEntry1);
when(mAccessPointController.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry); when(mAccessPointController.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[]{SUB_ID}); when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[]{SUB_ID});
when(mAccessPointController.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
when(mToastFactory.createToast(any(), anyString(), anyString(), anyInt(), anyInt())) when(mToastFactory.createToast(any(), anyString(), anyString(), anyInt(), anyInt()))
.thenReturn(mSystemUIToast); .thenReturn(mSystemUIToast);
when(mSystemUIToast.getView()).thenReturn(mToastView); when(mSystemUIToast.getView()).thenReturn(mToastView);
@@ -334,6 +333,17 @@ public class InternetDialogControllerTest extends SysuiTestCase {
.isNotEqualTo(getResourcesString("non_carrier_network_unavailable")); .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 @Test
public void getWifiDetailsSettingsIntent_withNoKey_returnNull() { public void getWifiDetailsSettingsIntent_withNoKey_returnNull() {
assertThat(mInternetDialogController.getWifiDetailsSettingsIntent(null)).isNull(); assertThat(mInternetDialogController.getWifiDetailsSettingsIntent(null)).isNull();