summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchangwan <changwan@chromium.org>2015-05-11 19:16:47 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-12 02:17:16 +0000
commit5a47aacd7961fbdc875ff4e7c58ee607195dd7a1 (patch)
treeee79705615a4d0df8c461dcf9c9d1ba718574abe
parent88912d80f0b54afaa81d86fda355dfc8915ef003 (diff)
downloadchromium_src-5a47aacd7961fbdc875ff4e7c58ee607195dd7a1.zip
chromium_src-5a47aacd7961fbdc875ff4e7c58ee607195dd7a1.tar.gz
chromium_src-5a47aacd7961fbdc875ff4e7c58ee607195dd7a1.tar.bz2
Add dark action bar color to colors.xml
We want to use the same color between Chrome and an external activity in GMS core, and we can launch this activity with a custom color, so this change makes the color accessible in both places. BUG=480598 Review URL: https://codereview.chromium.org/1136953008 Cr-Commit-Position: refs/heads/master@{#329324}
-rw-r--r--chrome/android/java/res/values-v17/styles.xml2
-rw-r--r--chrome/android/java/res/values/colors.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/android/java/res/values-v17/styles.xml b/chrome/android/java/res/values-v17/styles.xml
index 367b4c0..383eff4 100644
--- a/chrome/android/java/res/values-v17/styles.xml
+++ b/chrome/android/java/res/values-v17/styles.xml
@@ -96,7 +96,7 @@
<style name="ThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:windowBackground">@drawable/action_bar_activity_bg</item>
<!-- Action bar color -->
- <item name="colorPrimary">#263238</item>
+ <item name="colorPrimary">@color/dark_action_bar_color</item>
<!-- Status bar color -->
<item name="colorPrimaryDark">#161e21</item>
<!-- Color of checkboxes, switches, buttons, etc. -->
diff --git a/chrome/android/java/res/values/colors.xml b/chrome/android/java/res/values/colors.xml
index f39ddde..e486e49 100644
--- a/chrome/android/java/res/values/colors.xml
+++ b/chrome/android/java/res/values/colors.xml
@@ -13,6 +13,7 @@
<color name="input_underline_error_color">#d32f2f</color>
<color name="explanation_text_color">#909090</color>
<color name="text_highlight_color">#C6DAFC</color>
+ <color name="dark_action_bar_color">#263238</color>
<!-- Infobar colors -->
<color name="infobar_background">#fff</color>