summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2015-02-06 18:02:10 -0800
committerAlan Newberger <alann@google.com>2015-02-06 18:02:10 -0800
commit8992a26dd589310b2f45cbb01c158f324fd10289 (patch)
tree924390fd9a8f240fcbdd46942717f39c58b9d83c /res/drawable
parentc3adc0558139f6b7424f8be1116c246455bdf6ab (diff)
downloadandroid_packages_apps_Camera2-8992a26dd589310b2f45cbb01c158f324fd10289.tar.gz
android_packages_apps_Camera2-8992a26dd589310b2f45cbb01c158f324fd10289.tar.bz2
android_packages_apps_Camera2-8992a26dd589310b2f45cbb01c158f324fd10289.zip
gray cleanup to 1b1b1b
During Material update, filmstrip background was intentionally made 1b1b1b. Capture button and mode covers were slightly off from a previous gray design. Unifying all to one color constant. There are other, unused background specified from older times, removing them as part of cleanup. Confirmed with UX that all these colors should be 1b1b1b. Change-Id: I3da07e9828546d2c9d30a8ac756a0bbb89d6376c
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/cover.xml2
-rw-r--r--res/drawable/photopage_bottom_button_background.xml5
-rw-r--r--res/drawable/shutter_button_background_refocus.xml2
-rw-r--r--res/drawable/shutter_button_background_still.xml2
4 files changed, 3 insertions, 8 deletions
diff --git a/res/drawable/cover.xml b/res/drawable/cover.xml
index f340b2866..63d30920c 100644
--- a/res/drawable/cover.xml
+++ b/res/drawable/cover.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
- <color android:color="@color/mode_cover_default_color"/>
+ <color android:color="@color/camera_gray_background"/>
</item>
<item>
<bitmap android:src="@drawable/ic_camera_blanket" android:gravity="center" />
diff --git a/res/drawable/photopage_bottom_button_background.xml b/res/drawable/photopage_bottom_button_background.xml
deleted file mode 100644
index 0c772ad21..000000000
--- a/res/drawable/photopage_bottom_button_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@android:color/holo_blue_light" android:state_pressed="true"/>
- <item android:drawable="@color/button_dark_transparent_background" android:state_selected="false"/>
-</selector>
diff --git a/res/drawable/shutter_button_background_refocus.xml b/res/drawable/shutter_button_background_refocus.xml
index 8db6dadb9..e81e9db1b 100644
--- a/res/drawable/shutter_button_background_refocus.xml
+++ b/res/drawable/shutter_button_background_refocus.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@color/bottombar_unpressed" />
+ <item android:drawable="@color/camera_gray_background" />
</layer-list>
diff --git a/res/drawable/shutter_button_background_still.xml b/res/drawable/shutter_button_background_still.xml
index 8db6dadb9..e81e9db1b 100644
--- a/res/drawable/shutter_button_background_still.xml
+++ b/res/drawable/shutter_button_background_still.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@color/bottombar_unpressed" />
+ <item android:drawable="@color/camera_gray_background" />
</layer-list>