summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-09-14 21:07:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-14 21:07:47 -0700
commitf9ca064c115117c60568093d9e00350cf18688d5 (patch)
tree626322f98b0ef5f17c646644b9d35294ed94c556
parentfa959aede9b1fe9d510108e883a2f16cf28c9033 (diff)
parentd9fecfddde51f75928830f9810b11be8051f554a (diff)
downloadLegacyCamera-f9ca064c115117c60568093d9e00350cf18688d5.zip
LegacyCamera-f9ca064c115117c60568093d9e00350cf18688d5.tar.gz
LegacyCamera-f9ca064c115117c60568093d9e00350cf18688d5.tar.bz2
Merge "Add background for mode picker in phone UI."
-rw-r--r--res/drawable-hdpi/bg_switcher.pngbin0 -> 2945 bytes
-rw-r--r--res/drawable-mdpi/bg_switcher.pngbin0 -> 1805 bytes
-rw-r--r--res/drawable-xhdpi/bg_switcher.pngbin0 -> 4122 bytes
-rw-r--r--res/layout/mode_picker.xml4
-rw-r--r--res/values/colors.xml1
5 files changed, 2 insertions, 3 deletions
diff --git a/res/drawable-hdpi/bg_switcher.png b/res/drawable-hdpi/bg_switcher.png
new file mode 100644
index 0000000..57a8cf8
--- /dev/null
+++ b/res/drawable-hdpi/bg_switcher.png
Binary files differ
diff --git a/res/drawable-mdpi/bg_switcher.png b/res/drawable-mdpi/bg_switcher.png
new file mode 100644
index 0000000..e457da8
--- /dev/null
+++ b/res/drawable-mdpi/bg_switcher.png
Binary files differ
diff --git a/res/drawable-xhdpi/bg_switcher.png b/res/drawable-xhdpi/bg_switcher.png
new file mode 100644
index 0000000..d80a300
--- /dev/null
+++ b/res/drawable-xhdpi/bg_switcher.png
Binary files differ
diff --git a/res/layout/mode_picker.xml b/res/layout/mode_picker.xml
index 228a68e..f7a61a0 100644
--- a/res/layout/mode_picker.xml
+++ b/res/layout/mode_picker.xml
@@ -24,7 +24,7 @@
android:layout_alignBottom="@+id/mode_selection"
android:layout_width="match_parent"
android:layout_height="55dp"
- android:background="@color/mode_picker_background">
+ android:background="@drawable/bg_switcher">
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@android:color/white"/>
@@ -60,7 +60,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="198dp"
- android:background="@color/mode_picker_background"
+ android:background="@drawable/bg_switcher"
android:visibility="gone">
<View android:layout_width="match_parent"
android:layout_height="1dp"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 29ce09e..8551a16 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -34,5 +34,4 @@
<color name="pano_progress_indication">#FF0099CC</color>
<color name="pano_progress_indication_fast">#FFFF2222</color>
<color name="mode_selection_border">#33B5E5</color>
- <color name="mode_picker_background">#33000000</color>
</resources>