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

Commit ba3166e4 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '4956-Q-Network_settings_crash_on_multiple_sim_issue' into 'v1-q' 

4956-Q-Network_settings_crash_on_multiple_sim_issue

See merge request !92
parents 99b520e4 f7b3dd46

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

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ public class DataUsageSummaryPreference extends Preference { 
                        TextUtils.expandTemplate(getContext().getText(R.string.data_remaining),

                                DataUsageUtils.formatDataUsage(getContext(), dataRemaining)));

                usageRemainingField.setTextColor(

                        Utils.getColorAttr(getContext(), R.color.color_default_accent));

                        Utils.getColorAttr(getContext(), android.R.attr.colorAccent));

            } else {

                usageRemainingField.setText(

                        TextUtils.expandTemplate(getContext().getText(R.string.data_overusage),

src/com/android/settings/deviceinfo/StorageVolumePreference.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class StorageVolumePreference extends Preference { 


        mStorageManager = context.getSystemService(StorageManager.class);

        mVolume = volume;

        mColorTintList = Utils.getColorAttr(context, R.color.color_default_accent);

        mColorTintList = Utils.getColorAttr(context, android.R.attr.colorAccent);



        setLayoutResource(R.layout.storage_volume);

src/com/android/settings/deviceinfo/storage/UserProfileController.java

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class UserProfileController extends AbstractPreferenceController implemen 


    private static Drawable applyTint(Context context, Drawable icon) {

        icon = icon.mutate();

        icon.setTintList(Utils.getColorAttr(context, R.color.color_default_accent));

        icon.setTintList(Utils.getColorAttr(context, android.R.attr.colorAccent));

        return icon;

    }

src/com/android/settings/network/telephony/MobileNetworkUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ public class MobileNetworkUtils { 
        // Set the signal strength icon at the bottom right

        icons.setLayerGravity(1 /* index of SignalDrawable */, Gravity.BOTTOM | Gravity.RIGHT);

        icons.setLayerSize(1 /* index of SignalDrawable */, iconSize, iconSize);

        icons.setTintList(Utils.getColorAttr(context, R.color.color_default_accent));

        icons.setTintList(Utils.getColorAttr(context, android.R.attr.colorAccent));

        return icons;

    }

src/com/android/settings/notification/ImportancePreference.java

+2 −2
Original line number Diff line number Diff line
@@ -155,11 +155,11 @@ public class ImportancePreference extends Preference { 
    }



    private ColorStateList getAccentTint() {

        return Utils.getColorAttr(getContext(), com.android.settings.R.color.color_default_accent);

        return Utils.getColorAttr(getContext(), android.R.attr.colorAccent);

    }



    private ColorStateList getRegularTint() {

        return Utils.getColorAttr(getContext(), com.android.settings.R.color.color_default_primary_text);

        return Utils.getColorAttr(getContext(), android.R.attr.textColorPrimary);

    }



    void setImportanceSummary(ViewGroup parent, int importance, boolean fromUser) {