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

Commit 6bd382b8 authored by Daniel Bright's avatar Daniel Bright Committed by Gerrit Code Review
Browse files

Merge "Revert "access system resources with android.R package""

parents 526741a2 309505a7

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

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

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(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;