summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-03-14 03:23:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-14 03:23:28 +0000
commitc6a12b24b4662ba9fa7cc8c7d072ecb0a8f79e46 (patch)
treeae60fb0bf9b3546cd57f19947b87fcdf29c44ca4
parent5bedc41eb4bf30fe277de3977db8331f970c8f0b (diff)
parent9f26185bff28731e37d162a0ec59060b3ec0220a (diff)
downloadandroid_packages_apps_Gallery2-c6a12b24b4662ba9fa7cc8c7d072ecb0a8f79e46.tar.gz
android_packages_apps_Gallery2-c6a12b24b4662ba9fa7cc8c7d072ecb0a8f79e46.tar.bz2
android_packages_apps_Gallery2-c6a12b24b4662ba9fa7cc8c7d072ecb0a8f79e46.zip
Merge "add icon to indicate menu" into gb-ub-photos-bryce
-rw-r--r--res/drawable/filtershow_menu_marker.pngbin0 -> 1164 bytes
-rw-r--r--res/layout/filtershow_editor_panel.xml3
2 files changed, 2 insertions, 1 deletions
diff --git a/res/drawable/filtershow_menu_marker.png b/res/drawable/filtershow_menu_marker.png
new file mode 100644
index 000000000..1537a7169
--- /dev/null
+++ b/res/drawable/filtershow_menu_marker.png
Binary files differ
diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml
index fbff33f7e..8560a5bf1 100644
--- a/res/layout/filtershow_editor_panel.xml
+++ b/res/layout/filtershow_editor_panel.xml
@@ -78,7 +78,8 @@
android:background="@android:color/transparent"
android:gravity="center"
android:text="@string/apply_effect"
- android:textSize="18dip" />
+ android:textSize="18dip"
+ android:drawableRight="@drawable/filtershow_menu_marker"/>
</LinearLayout>
<ImageView