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

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

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

Change-Id: I7bb2dbb8b1bcba2d6d568397158e3512c0b2df61
This commit is contained in:
Zoey Chen
2021-09-01 04:22:59 +00:00
committed by Automerger Merge Worker
parent 2abb74cdd3 2d827ddf50
commit ae633368e2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)