diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2014-11-05 20:35:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-05 20:35:27 +0000 |
| commit | 0d482f2483183df0856e4f56e962c22cee5869d7 (patch) | |
| tree | 4c5c397195d8297b4c90227fd22f29c5bdd8e90e | |
| parent | 2d25620627448ba91bf6beafc174d5f6c6a4bbb6 (diff) | |
| parent | 815c61d729715e6d7a19fbf4f039d59d0dddc265 (diff) | |
| download | packages_apps_Settings-0d482f2483183df0856e4f56e962c22cee5869d7.zip packages_apps_Settings-0d482f2483183df0856e4f56e962c22cee5869d7.tar.gz packages_apps_Settings-0d482f2483183df0856e4f56e962c22cee5869d7.tar.bz2 | |
am 815c61d7: Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
* commit '815c61d729715e6d7a19fbf4f039d59d0dddc265':
Change for setting transparency of sim colors.
| -rw-r--r-- | res/values/arrays.xml | 10 | ||||
| -rw-r--r-- | res/values/colors.xml | 10 | ||||
| -rw-r--r-- | src/com/android/settings/sim/SimSettings.java | 2 |
3 files changed, 1 insertions, 21 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index e613617..716da00 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1260,16 +1260,6 @@ <item>Cached (empty)</item> </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 --> <string-array name="color_picker"> <item>Teal</item> diff --git a/res/values/colors.xml b/res/values/colors.xml index 5ccae84..6ccced2 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -74,14 +74,4 @@ <color name="switch_accent_color">#ff7fcac3</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> diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 379232f..958260b 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -469,7 +469,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable mSlotId = slotId; setKey("sim" + mSlotId); update(); - colorArr = context.getResources().getIntArray(R.array.sim_colors); + colorArr = context.getResources().getIntArray(com.android.internal.R.array.sim_colors); } public void update() { |