summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrizzoli <joey@cyanogenmoditalia.it>2016-02-23 09:39:32 +0100
committerMichael Bestas <mikeioannina@gmail.com>2016-12-30 21:04:50 +0200
commitd0179981e52c4b787fe76d7418fb57e428f66beb (patch)
tree7bf267db0887abfc14b82cd5461d2b6357901ed7
parente1d7ec9aa5e10eb2092f69961d8c78bb4c84b3c9 (diff)
downloadandroid_packages_apps_Messaging-d0179981e52c4b787fe76d7418fb57e428f66beb.tar.gz
android_packages_apps_Messaging-d0179981e52c4b787fe76d7418fb57e428f66beb.tar.bz2
android_packages_apps_Messaging-d0179981e52c4b787fe76d7418fb57e428f66beb.zip
Messaging: bring back accent color
Change-Id: I217da3339dcfbe87388b5ee06b156e37c205df4f
-rwxr-xr-xres/values/cm_colors.xml19
-rw-r--r--res/values/colors.xml10
-rwxr-xr-xres/values/styles.xml4
3 files changed, 27 insertions, 6 deletions
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
new file mode 100755
index 0000000..05e91e0
--- /dev/null
+++ b/res/values/cm_colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--><resources>
+ <color name="cm_accent">#FF9800</color>
+ <color name="button_text">#000000</color>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f33e105..054c3a7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -62,13 +62,13 @@
<color name="message_text_color_outgoing">#ff323232</color>
<color name="conversation_background">#eeeeee</color>
<color name="conversation_edge_effect">#9d9d9d</color>
- <color name="compose_message_send_color">@color/primary_color</color>
+ <color name="compose_message_send_color">@color/cm_accent</color>
<color name="compose_message_send_color_pressed">#999999</color>
<color name="message_bubble_color_outgoing">#ffffffff</color>
<color name="message_error_bubble_color_incoming">#e2e2e2</color>
<color name="message_audio_button_color_incoming">#ffffffff</color>
- <color name="message_bubble_color_selected">#8BC34A</color>
- <color name="message_image_selected_tint">#80689F38</color>
+ <color name="message_bubble_color_selected">@color/cm_accent</color>
+ <color name="message_image_selected_tint">#80FF9800</color>
<color name="generic_video_icon">#ff808080</color>
<!-- Base color used for color filtering. -->
@@ -124,12 +124,12 @@
<color name="people_and_options_header_text">#6d6d6d</color>
<color name="people_and_options_list_divider">#cccccc</color>
- <color name="fab_color">@color/primary_color</color>
+ <color name="fab_color">@color/cm_accent</color>
<color name="fab_pressed_color">#3ea4dc</color>
<color name="fab_ripple">#40ffffff</color>
<color name="message_text_counter_color">#555555</color>
- <color name="mms_indicator_color">#8BC34A</color>
+ <color name="mms_indicator_color">#681faf</color>
<color name="list_empty_text">#6d6d6d</color>
<color name="low_storage_action_item_color">#ff000000</color>
<color name="unblock_item_text_color">@color/primary_color</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6f3683b..5f473ad 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -34,7 +34,7 @@
<item name="android:dropDownListViewStyle">@style/DropDownListViewStyle</item>
<item name="colorPrimary">@color/action_bar_background_color</item>
<item name="colorPrimaryDark">@color/action_bar_background_color_dark</item>
- <item name="colorAccent">@color/action_bar_background_color</item>
+ <item name="colorAccent">@color/cm_accent</item>
<item name="android:textColorHighlight">@color/text_highlight_color</item>
<item name="actionBarStyle">@style/BugleActionBar</item>
<item name="apnPreferenceStyle">@style/ApnPreference</item>
@@ -47,6 +47,7 @@
<style name="BugleTheme.ConversationActivityBase" parent="BugleTheme">
<item name="android:windowBackground">@color/conversation_background</item>
<item name="windowActionBarOverlay">true</item>
+ <item name="colorAccent">@color/cm_accent</item>
<item name="android:fastScrollPreviewBackgroundLeft">@drawable/contacts_fastscroll_label_left</item>
<item name="android:fastScrollPreviewBackgroundRight">@drawable/contacts_fastscroll_label_right</item>
</style>
@@ -142,6 +143,7 @@
<item name="android:scrollHorizontally">false</item>
<item name="android:textCursorDrawable">@null</item>
<item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
+ <item name="android:colorAccent">@color/cm_accent</item>
</style>
<style name="ConversationComposeSubjectText" parent="ConversationComposeSendText">