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

Commit ae633368 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is... 

Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev am: f25a0021 am: 2d827ddf

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

Change-Id: I7bb2dbb8b1bcba2d6d568397158e3512c0b2df61
parents 2abb74cd 2d827ddf

src/com/android/settings/network/SubscriptionsPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -311,7 +311,8 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl 
            numLevels += 1;

        }



        Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels, false);

        Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels,

                !mTelephonyManager.isDataEnabled());

        final boolean isActiveCellularNetwork =

                mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext);

        if (isActiveCellularNetwork || (mWifiPickerTrackerHelper != null)

tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java

+4 −1
Original line number Diff line number Diff line
@@ -665,6 +665,7 @@ public class SubscriptionsPreferenceControllerTest { 
        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);

        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();

        Drawable icon = mock(Drawable.class);

        when(mTelephonyManager.isDataEnabled()).thenReturn(true);

        doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));

        setupGetIconConditions(sub.get(0).getSubscriptionId(), true, true,

                true, ServiceState.STATE_IN_SERVICE);
@@ -683,6 +684,7 @@ public class SubscriptionsPreferenceControllerTest { 
        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);

        doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();

        Drawable icon = mock(Drawable.class);

        when(mTelephonyManager.isDataEnabled()).thenReturn(true);

        doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));

        setupGetIconConditions(subId, false, true,

                true, ServiceState.STATE_IN_SERVICE);
@@ -701,7 +703,8 @@ public class SubscriptionsPreferenceControllerTest { 
        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);

        doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();

        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,

                false, ServiceState.STATE_IN_SERVICE);