From 47304aa7db27ef33cc9bcae52dee9ea7d3b9316f Mon Sep 17 00:00:00 2001 From: Fahim Date: Fri, 25 Feb 2022 12:28:57 +0600 Subject: [PATCH] 4956-Q-Network_settings_crash_on_multiple_sim_issue issue: https://gitlab.e.foundation/e/backlog/-/issues/4956 utils.getColorAttr is failed to retrieve color from colors xml directly --- .../settings/datausage/DataUsageSummaryPreference.java | 2 +- .../android/settings/deviceinfo/StorageVolumePreference.java | 2 +- .../settings/deviceinfo/storage/UserProfileController.java | 2 +- .../settings/network/telephony/MobileNetworkUtils.java | 2 +- .../android/settings/notification/ImportancePreference.java | 4 ++-- .../privacy/PermissionBarChartPreferenceController.java | 2 +- src/com/android/settings/sim/SimListDialogFragment.java | 2 +- .../android/settings/wifi/NetworkRequestDialogFragment.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index dc4c1eb7cc9..653ce027935 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -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), diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java index 32883bac7fd..8b47046655c 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -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); diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java index 6d5f8d3a28f..01b5e8d0d7e 100644 --- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java +++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java @@ -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; } diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index dd993fa553f..2806caab96d 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -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; } diff --git a/src/com/android/settings/notification/ImportancePreference.java b/src/com/android/settings/notification/ImportancePreference.java index 7cca2bc86c4..702a278cd7a 100644 --- a/src/com/android/settings/notification/ImportancePreference.java +++ b/src/com/android/settings/notification/ImportancePreference.java @@ -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) { diff --git a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java index 62ea975ce10..bb43a16bc77 100644 --- a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java +++ b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java @@ -206,7 +206,7 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro try { icon = mPackageManager.getPermissionGroupInfo(permissionGroup, 0) .loadIcon(mPackageManager); - icon.setTintList(Utils.getColorAttr(mContext, R.color.color_default_secondary_text)); + icon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorSecondary)); } catch (PackageManager.NameNotFoundException e) { Log.w(TAG, "Cannot find group icon for " + permissionGroup, e); } diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java index 9163a97f1f5..a5d4157818c 100644 --- a/src/com/android/settings/sim/SimListDialogFragment.java +++ b/src/com/android/settings/sim/SimListDialogFragment.java @@ -177,7 +177,7 @@ public class SimListDialogFragment extends SimDialogFragment implements summary.setText(""); icon.setImageDrawable(mContext.getDrawable(R.drawable.ic_feedback_24dp)); icon.setImageTintList( - Utils.getColorAttr(mContext, R.color.color_default_secondary_text)); + Utils.getColorAttr(mContext, android.R.attr.textColorSecondary)); } else { title.setText(sub.getDisplayName()); summary.setText(isMdnProvisioned(sub.getNumber()) ? sub.getNumber() : ""); diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java index 9c5db4b754f..93a81001bd4 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java @@ -400,7 +400,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp final Drawable drawable = getContext().getDrawable( Utils.getWifiIconResource(level)); drawable.setTintList( - Utils.getColorAttr(getContext(), R.color.color_default_accent)); + Utils.getColorAttr(getContext(), android.R.attr.colorAccent)); imageView.setImageDrawable(drawable); } -- GitLab