Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49cd1555 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I663f693f498e3566deb37f6175fc0bb214264118
parents cc353190 ef77c1d6

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/sim/SimPreferenceDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -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;