summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorErin Dahlgren <edahlgren@google.com>2014-02-03 14:01:54 -0800
committerErin Dahlgren <edahlgren@google.com>2014-02-03 14:01:54 -0800
commit14466ba8f9ee23c003067f2c7b5569a6417cc60a (patch)
tree1db027fa761f634279c0bf968151a65117b6a004 /res/values
parent165bb8d85e6eab4e261c6b21a754ee227f732795 (diff)
downloadandroid_packages_apps_Camera2-14466ba8f9ee23c003067f2c7b5569a6417cc60a.tar.gz
android_packages_apps_Camera2-14466ba8f9ee23c003067f2c7b5569a6417cc60a.tar.bz2
android_packages_apps_Camera2-14466ba8f9ee23c003067f2c7b5569a6417cc60a.zip
Set bottom bar to a consistent color across app.
Change-Id: Ieda492a9dbc122a828d8b5d8df831fbe99e6295f
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml12
-rw-r--r--res/values/colors.xml9
2 files changed, 2 insertions, 19 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 384b62125..e191859aa 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -617,18 +617,6 @@
<item>@color/craft_mode_color</item>
</array>
- <array name="camera_mode_theme_pressed_color">
- <item>@color/camera_mode_pressed_color</item>
- <item>@color/video_mode_pressed_color</item>
- <item>@color/craft_mode_pressed_color</item>
- <item>@color/photosphere_mode_pressed_color</item>
- <item>@color/panorama_mode_pressed_color</item>
- <item>@color/timelapse_mode_pressed_color</item>
- <item>@color/settings_mode_pressed_color</item>
- <item>@color/craft_mode_pressed_color</item>
- <item>@color/craft_mode_pressed_color</item>
- </array>
-
<string-array name="camera_mode_text">
<item>@string/mode_camera</item>
<item>@string/mode_video</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 79c37ab7c..e9dcf5075 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -85,13 +85,8 @@
<color name="panorama_mode_color">#f1c938</color>
<color name="settings_mode_color">#58595b</color>
- <color name="camera_mode_pressed_color">#9ec0fa</color>
- <color name="video_mode_pressed_color">#e5948c</color>
- <color name="craft_mode_pressed_color">#a1c493</color>
- <color name="photosphere_mode_pressed_color">#9b7baa</color>
- <color name="timelapse_mode_pressed_color">#88695e</color>
- <color name="panorama_mode_pressed_color">#fbd569</color>
- <color name="settings_mode_pressed_color">#58595b</color>
+ <color name="bottombar_unpressed">#191919</color>
+ <color name="bottombar_pressed">#262626</color>
<color name="filmstrip_background">#000000</color>