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

Merge "access system resources with android.R package" am: ef77c1d67f

Browse Source 
Change-Id: I663f693f498e3566deb37f6175fc0bb214264118
This commit is contained in:
Automerger Merge Worker
2020-01-31 15:55:52 +00:00
parent cc3531906a ef77c1d67f
commit 49cd1555f3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
View File

@@ -200,7 +200,7 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
private Color[] getColors() {
final Resources res = getContext().getResources();
final int[] colorInts = res.getIntArray(com.android.internal.R.array.sim_colors);
final int[] colorInts = res.getIntArray(android.R.array.simColors);
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);

2
src/com/android/settings/sim/SimPreferenceDialog.java
View File

@@ -65,7 +65,7 @@ public class SimPreferenceDialog extends Activity {
mSlotId = extras.getInt(SimSettings.EXTRA_SLOT_ID, -1);
mSubscriptionManager = SubscriptionManager.from(mContext);
mSubInfoRecord = mSubscriptionManager.getActiveSubscriptionInfoForSimSlotIndex(mSlotId);
mTintArr = mContext.getResources().getIntArray(com.android.internal.R.array.sim_colors);
mTintArr = mContext.getResources().getIntArray(android.R.array.simColors);
mColorStrings = mContext.getResources().getStringArray(R.array.color_picker);
mTintSelectorPos = 0;