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

Merge "Change for setting transparency of sim colors." into lmp-mr1-dev

Browse Source
This commit is contained in:
Sanket Padawe
2014-11-05 20:30:26 +00:00
committed by Android (Google) Code Review
parent 92f02463fc 8942c62165
commit 815c61d729
3 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/arrays.xml
View File

@@ -1260,16 +1260,6 @@
<item>Cached (empty)</item> <item>Cached (empty)</item>
</string-array> </string-array>
<!-- Array storing rgb values of sim colors for multi-sim -->
<array name="sim_colors">
<item>@color/Teal_700</item>
<item>@color/Blue_700</item>
<item>@color/Indigo_700</item>
<item>@color/Purple_700</item>
<item>@color/Pink_700</item>
<item>@color/Red_700</item>
</array>
<!-- Array of titles for sim color for multi-sim --> <!-- Array of titles for sim color for multi-sim -->
<string-array name="color_picker"> <string-array name="color_picker">
<item>Teal</item> <item>Teal</item>

10
res/values/colors.xml
View File

@@ -74,14 +74,4 @@
<color name="switch_accent_color">#ff7fcac3</color> <color name="switch_accent_color">#ff7fcac3</color>
<color name="wifi_divider">#ffe0e0e0</color> <color name="wifi_divider">#ffe0e0e0</color>
<!-- Multi-SIM colors Todo: To check whether to append 00 or FF before color values-->
<color name="Teal_700">#0000796b</color>
<color name="Blue_700">#003367d6</color>
<color name="Indigo_700">#00303f9f</color>
<color name="Purple_700">#007b1fa2</color>
<color name="Pink_700">#00c2185b</color>
<color name="Red_700">#00c53929</color>
</resources> </resources>

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

@@ -469,7 +469,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
mSlotId = slotId; mSlotId = slotId;
setKey("sim" + mSlotId); setKey("sim" + mSlotId);
update(); update();
colorArr = context.getResources().getIntArray(R.array.sim_colors); colorArr = context.getResources().getIntArray(com.android.internal.R.array.sim_colors);
} }
public void update() { public void update() {