Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce
diff --git a/res/drawable-hdpi/ic_menu_edit_holo_dark.png b/res/drawable-hdpi/ic_menu_edit_holo_dark.png
new file mode 100644
index 0000000..54952f5
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_edit_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_edit_holo_dark.png b/res/drawable-mdpi/ic_menu_edit_holo_dark.png
new file mode 100644
index 0000000..ca9188e
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_edit_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_edit_holo_dark.png b/res/drawable-xhdpi/ic_menu_edit_holo_dark.png
new file mode 100644
index 0000000..65e72c1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_edit_holo_dark.png
Binary files differ
diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml
index 85ab010..015fa26 100644
--- a/res/layout-land/filtershow_editor_panel.xml
+++ b/res/layout-land/filtershow_editor_panel.xml
@@ -101,7 +101,8 @@
android:gravity="center"
android:text="@string/apply_effect"
android:textSize="18dip"
- android:drawableRight="@drawable/filtershow_menu_marker"/>
+ android:drawableRight="@drawable/filtershow_menu_marker"
+ android:textAllCaps="true" />
</LinearLayout>
diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml
index ef2fb8b..a6da46a 100644
--- a/res/layout/filtershow_editor_panel.xml
+++ b/res/layout/filtershow_editor_panel.xml
@@ -85,7 +85,8 @@
android:gravity="center"
android:text="@string/apply_effect"
android:textSize="18dip"
- android:drawableRight="@drawable/filtershow_menu_marker"/>
+ android:drawableRight="@drawable/filtershow_menu_marker"
+ android:textAllCaps="true" />
</LinearLayout>
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index 8fe594d..f3226e6 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -10,7 +10,7 @@
android:visibility="gone">
<ImageButton
android:id="@+id/photopage_bottom_control_edit"
- android:src="@drawable/ic_photoeditor_effects"
+ android:src="@drawable/ic_menu_edit_holo_dark"
android:background="@drawable/photopage_bottom_button_background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
