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

Commit c6843e3a authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 100a7449 9e2147d8

res/xml/app_data_usage.xml

+4 −2
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 


    <PreferenceCategory

        android:key="app_data_usage_settings_category"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        android:layout="@layout/preference_category_no_label">



        <Preference
@@ -71,12 +70,14 @@ 
        <com.android.settingslib.RestrictedSwitchPreference

            android:key="restrict_cellular"

            android:title="@string/data_usage_app_restrict_mobile"

            android:summary="@string/data_usage_app_restrict_mobile_summary" />

            android:summary="@string/data_usage_app_restrict_mobile_summary"

            settings:isPreferenceVisible="@bool/config_show_sim_info" />



        <com.android.settingslib.RestrictedSwitchPreference

            android:key="restrict_background"

            android:title="@string/data_usage_app_restrict_background"

            android:summary="@string/data_usage_app_restrict_background_summary"

            settings:isPreferenceVisible="@bool/config_show_sim_info"

            settings:useAdditionalSummary="true"

            settings:restrictedSwitchSummary="@string/disabled_by_admin" />
@@ -89,6 +90,7 @@ 
            android:key="unrestricted_data_saver"

            android:title="@string/unrestricted_app_title"

            android:summary="@string/unrestricted_app_summary"

            settings:isPreferenceVisible="@bool/config_show_sim_info"

            settings:useAdditionalSummary="true"

            settings:restrictedSwitchSummary="@string/disabled_by_admin" />

src/com/android/settings/datausage/AppDataUsage.java

+1 −8
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
    private long mSelectedCycle;

    private boolean mIsLoading;



    public boolean isSimHardwareVisible(Context context) {

        return SubscriptionUtil.isSimHardwareVisible(context);

    }



    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);
@@ -181,7 +177,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
        final UidDetailProvider uidDetailProvider = getUidDetailProvider();



        if (mAppItem.key > 0) {

            if ((!isSimHardwareVisible(mContext)) || !UserHandle.isApp(mAppItem.key)) {

            if (!UserHandle.isApp(mAppItem.key)) {

                final UidDetail uidDetail = uidDetailProvider.getUidDetail(mAppItem.key, true);

                mIcon = uidDetail.icon;

                mLabel = uidDetail.label;
@@ -384,9 +380,6 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
    private void updatePrefs(boolean restrictBackground, boolean unrestrictData,

            boolean restrictAll, boolean restrictCellular, boolean restrictVpn,

            boolean restrictWifi, boolean hasInternetPermission) {

        if (!isSimHardwareVisible(mContext)) {

            return;

        }

        setBackPreferenceListAnimatorIfLoaded();

        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted(

                mContext, mPackageName, UserHandle.getUserId(mAppItem.key));