diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-09-12 23:01:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 23:01:34 +0000 |
| commit | 8e2a41b7e68338fea06d2a64864348e70d8afe7d (patch) | |
| tree | 3aa3336871ac1e244ce6c01003a21d63cac578bc | |
| parent | fcf74f8dddddd350466e406f9f1cb2181077ffda (diff) | |
| parent | 80be412507340d47fc9dbb8a23ba2628f4e3ad1f (diff) | |
| download | android_packages_apps_Gallery2-8e2a41b7e68338fea06d2a64864348e70d8afe7d.tar.gz android_packages_apps_Gallery2-8e2a41b7e68338fea06d2a64864348e70d8afe7d.tar.bz2 android_packages_apps_Gallery2-8e2a41b7e68338fea06d2a64864348e70d8afe7d.zip | |
Merge "Fix triangle indicator" into gb-ub-photos-carlsbad
| -rw-r--r-- | res/drawable/filtershow_menu_marker.png | bin | 1164 -> 1196 bytes | |||
| -rw-r--r-- | res/layout-land/filtershow_editor_panel.xml | 1 | ||||
| -rw-r--r-- | res/layout/filtershow_editor_panel.xml | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/editors/Editor.java | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/res/drawable/filtershow_menu_marker.png b/res/drawable/filtershow_menu_marker.png Binary files differindex 1537a7169..cf720e129 100644 --- a/res/drawable/filtershow_menu_marker.png +++ b/res/drawable/filtershow_menu_marker.png diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml index e49725236..18b13a43a 100644 --- a/res/layout-land/filtershow_editor_panel.xml +++ b/res/layout-land/filtershow_editor_panel.xml @@ -84,7 +84,6 @@ android:layout_height="fill_parent" android:layout_gravity="center" android:background="@android:color/transparent" - android:gravity="center" android:text="@string/apply_effect" android:textSize="18dip" android:drawableRight="@drawable/filtershow_menu_marker" diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml index 7332657a4..dd915352c 100644 --- a/res/layout/filtershow_editor_panel.xml +++ b/res/layout/filtershow_editor_panel.xml @@ -87,11 +87,11 @@ android:layout_height="fill_parent" android:layout_gravity="center" android:background="@android:color/transparent" - android:gravity="center" android:text="@string/apply_effect" android:textSize="18dip" android:drawableRight="@drawable/filtershow_menu_marker" - android:textAllCaps="true" /> + android:textAllCaps="true" + /> </LinearLayout> diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java index 5f8e8f6f6..59ad1b6a6 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, 0, on ? R.drawable.filtershow_menu_marker : 0); } protected void createMenu(int[] strId, View button) { |
