PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723689

Change-Id: I0b2458d050882d10c7aa6820e762f69612bf5004
This commit is contained in:
TreeHugger Robot
2021-12-22 03:01:12 +00:00
committed by Automerger Merge Worker
parent bad8e1ccfa da8ab6a51d
commit 8c799744a3
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/ProviderModelSliceHelper.java
View File

@@ -140,7 +140,7 @@ public class ProviderModelSliceHelper {
numLevels += 1; numLevels += 1;
} }
return MobileNetworkUtils.getSignalStrengthIcon(mContext, level, numLevels, return MobileNetworkUtils.getSignalStrengthIcon(mContext, level, numLevels,
NO_CELL_DATA_TYPE_ICON, false); NO_CELL_DATA_TYPE_ICON, !mTelephonyManager.isDataEnabled());
} }
/** /**

3
src/com/android/settings/network/SubscriptionsPreferenceController.java
View File

@@ -311,7 +311,8 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
numLevels += 1; numLevels += 1;
} }
Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels, false); Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels,
!mTelephonyManager.isDataEnabled());
final boolean isActiveCellularNetwork = final boolean isActiveCellularNetwork =
mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext); mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext);
if (isActiveCellularNetwork || (mWifiPickerTrackerHelper != null) if (isActiveCellularNetwork || (mWifiPickerTrackerHelper != null)

7
tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
View File

@@ -224,8 +224,9 @@ public class ProviderModelSliceHelperTest {
public void getMobileDrawable_noCarrierData_getMobileDrawable() throws Throwable { public void getMobileDrawable_noCarrierData_getMobileDrawable() throws Throwable {
mockConnections(false, ServiceState.STATE_OUT_OF_SERVICE, "", mockConnections(false, ServiceState.STATE_OUT_OF_SERVICE, "",
false, true); false, true);
when(mConnectivityManager.getActiveNetwork()).thenReturn(null);
Drawable expectDrawable = mock(Drawable.class); Drawable expectDrawable = mock(Drawable.class);
when(mConnectivityManager.getActiveNetwork()).thenReturn(null);
when(mTelephonyManager.isDataEnabled()).thenReturn(false);
assertThat(mProviderModelSliceHelper.getMobileDrawable(expectDrawable)).isEqualTo( assertThat(mProviderModelSliceHelper.getMobileDrawable(expectDrawable)).isEqualTo(
expectDrawable); expectDrawable);
@@ -236,8 +237,9 @@ public class ProviderModelSliceHelperTest {
throws Throwable { throws Throwable {
mockConnections(true, ServiceState.STATE_IN_SERVICE, "", true, mockConnections(true, ServiceState.STATE_IN_SERVICE, "", true,
true); true);
addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
Drawable drawable = mock(Drawable.class); Drawable drawable = mock(Drawable.class);
addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
when(mTelephonyManager.isDataEnabled()).thenReturn(true);
assertThat(mProviderModelSliceHelper.getMobileDrawable(drawable)).isEqualTo( assertThat(mProviderModelSliceHelper.getMobileDrawable(drawable)).isEqualTo(
mDrawableWithSignalStrength); mDrawableWithSignalStrength);
@@ -252,6 +254,7 @@ public class ProviderModelSliceHelperTest {
true); true);
Drawable drawable = mock(Drawable.class); Drawable drawable = mock(Drawable.class);
addNetworkTransportType(NetworkCapabilities.TRANSPORT_WIFI); addNetworkTransportType(NetworkCapabilities.TRANSPORT_WIFI);
when(mTelephonyManager.isDataEnabled()).thenReturn(true);
assertThat(mProviderModelSliceHelper.getMobileDrawable(drawable)).isEqualTo( assertThat(mProviderModelSliceHelper.getMobileDrawable(drawable)).isEqualTo(
mDrawableWithSignalStrength); mDrawableWithSignalStrength);

5
tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
View File

@@ -665,6 +665,7 @@ public class SubscriptionsPreferenceControllerTest {
doReturn(true).when(sInjector).isProviderModelEnabled(mContext); doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
Drawable icon = mock(Drawable.class); Drawable icon = mock(Drawable.class);
when(mTelephonyManager.isDataEnabled()).thenReturn(true);
doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false)); doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
setupGetIconConditions(sub.get(0).getSubscriptionId(), true, true, setupGetIconConditions(sub.get(0).getSubscriptionId(), true, true,
true, ServiceState.STATE_IN_SERVICE); true, ServiceState.STATE_IN_SERVICE);
@@ -683,6 +684,7 @@ public class SubscriptionsPreferenceControllerTest {
doReturn(true).when(sInjector).isProviderModelEnabled(mContext); doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
Drawable icon = mock(Drawable.class); Drawable icon = mock(Drawable.class);
when(mTelephonyManager.isDataEnabled()).thenReturn(true);
doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false)); doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
setupGetIconConditions(subId, false, true, setupGetIconConditions(subId, false, true,
true, ServiceState.STATE_IN_SERVICE); true, ServiceState.STATE_IN_SERVICE);
@@ -701,7 +703,8 @@ public class SubscriptionsPreferenceControllerTest {
doReturn(true).when(sInjector).isProviderModelEnabled(mContext); doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
Drawable icon = mock(Drawable.class); Drawable icon = mock(Drawable.class);
doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false)); when(mTelephonyManager.isDataEnabled()).thenReturn(false);
doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(true));
setupGetIconConditions(subId, false, false, setupGetIconConditions(subId, false, false,
false, ServiceState.STATE_IN_SERVICE); false, ServiceState.STATE_IN_SERVICE);