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

Merge "Revert "access system resources with android.R package"" am: 6bd382b85f

Browse Source 
Change-Id: Icb0a0cdcb759baf30ef97eb418a3fa73642587f9
This commit is contained in:
Daniel Bright
2020-04-06 20:12:47 +00:00
committed by Automerger Merge Worker
parent 2b54956856 6bd382b85f
commit 4644c7f0a6
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

@@ -212,7 +212,7 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
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);

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(android.R.array.simColors);
mTintArr = mContext.getResources().getIntArray(com.android.internal.R.array.sim_colors);
mColorStrings = mContext.getResources().getStringArray(R.array.color_picker);
mTintSelectorPos = 0;