commit 6249dfbd9fc6c910a7780ff9d812c423e19e53d1
author Daniel Bright <dbright@google.com> Fri Mar 20 04:57:43 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 20 04:57:43 2020 +0000
tree 22e2558a3943bb72baaa85f862ba77808ec5419a
parent b626a602c91e36dfd2f60c388afae065fa97540c
parent 3e26fc0f21cc2fb595b957f675c38b9edd852c35

Merge "Revert "access system resources with android.R package"" into rvc-dev

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

diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
index ab8327c..2340236 100644
--- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
@@ -200,7 +200,7 @@
 
     private Color[] getColors() {
         final Resources res = getContext().getResources();
-        final int[] colorInts = res.getIntArray(android.R.array.simColors);
+        final int[] colorInts = res.getIntArray(com.android.internal.R.array.sim_colors);
         final String[] colorStrings = res.getStringArray(R.array.color_picker);
         final int iconSize = res.getDimensionPixelSize(R.dimen.color_swatch_size);
         final int strokeWidth = res.getDimensionPixelSize(R.dimen.color_swatch_stroke_width);