From 7574509c9d3b73e77917333661e0a2fbab777129 Mon Sep 17 00:00:00 2001 From: John Hoford Date: Fri, 11 Oct 2013 10:08:22 -0700 Subject: fix RTL menu issues bug:11184806 Change-Id: I4562b13afc34069ed72a7bf497825abdd57a00ba --- res/drawable/filtershow_menu_marker_rtl.xml | 4 ++++ res/layout-land/filtershow_editor_panel.xml | 2 +- res/layout/filtershow_editor_panel.xml | 2 +- src/com/android/gallery3d/filtershow/editors/Editor.java | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 res/drawable/filtershow_menu_marker_rtl.xml diff --git a/res/drawable/filtershow_menu_marker_rtl.xml b/res/drawable/filtershow_menu_marker_rtl.xml new file mode 100644 index 000000000..151500472 --- /dev/null +++ b/res/drawable/filtershow_menu_marker_rtl.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml index 18b13a43a..f51dc14d0 100644 --- a/res/layout-land/filtershow_editor_panel.xml +++ b/res/layout-land/filtershow_editor_panel.xml @@ -86,7 +86,7 @@ android:background="@android:color/transparent" android:text="@string/apply_effect" android:textSize="18dip" - android:drawableRight="@drawable/filtershow_menu_marker" + android:drawableEnd="@drawable/filtershow_menu_marker_rtl" android:textAllCaps="true"/> diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml index dd915352c..995399618 100644 --- a/res/layout/filtershow_editor_panel.xml +++ b/res/layout/filtershow_editor_panel.xml @@ -89,7 +89,7 @@ android:background="@android:color/transparent" android:text="@string/apply_effect" android:textSize="18dip" - android:drawableRight="@drawable/filtershow_menu_marker" + android:drawableEnd="@drawable/filtershow_menu_marker_rtl" android:textAllCaps="true" /> diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java index 5f8e8f6f6..e3eec390b 100644 --- a/src/com/android/gallery3d/filtershow/editors/Editor.java +++ b/src/com/android/gallery3d/filtershow/editors/Editor.java @@ -285,7 +285,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis protected void setMenuIcon(boolean on) { mEditTitle.setCompoundDrawablesRelativeWithIntrinsicBounds( - 0, 0, on ? R.drawable.filtershow_menu_marker : 0, 0); + 0, 0, on ? R.drawable.filtershow_menu_marker_rtl : 0, 0); } protected void createMenu(int[] strId, View button) { -- cgit v1.2.3