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

Revert "access system resources with android.R package"

Browse Source 
Revert "access system resources with android.R package"

Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Test: make
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Merged-In: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
This commit is contained in:
Sooraj Sasindran
2020-03-16 20:58:16 +00:00
committed by Daniel Bright
parent b6fd42a06a
commit 309505a7d2
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() { private Color[] getColors() {
final Resources res = getContext().getResources(); 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 String[] colorStrings = res.getStringArray(R.array.color_picker);
final int iconSize = res.getDimensionPixelSize(R.dimen.color_swatch_size); final int iconSize = res.getDimensionPixelSize(R.dimen.color_swatch_size);
final int strokeWidth = res.getDimensionPixelSize(R.dimen.color_swatch_stroke_width); 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); mSlotId = extras.getInt(SimSettings.EXTRA_SLOT_ID, -1);
mSubscriptionManager = SubscriptionManager.from(mContext); mSubscriptionManager = SubscriptionManager.from(mContext);
mSubInfoRecord = mSubscriptionManager.getActiveSubscriptionInfoForSimSlotIndex(mSlotId); 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); mColorStrings = mContext.getResources().getStringArray(R.array.color_picker);
mTintSelectorPos = 0; mTintSelectorPos = 0;