diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-04-09 23:40:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-09 23:40:34 +0000 |
| commit | 77c6b786faf522a1cb5b214e9070553e3a690ca6 (patch) | |
| tree | efaa50c07f8a877a38a267634ffa25ac245c3a02 /res | |
| parent | 72eb8276bc1bea0deb63146ada1f6801eb8e410c (diff) | |
| parent | 6749b0b416d043b8cb327f8ae8864874e1e868d1 (diff) | |
| download | android_packages_apps_Snap-77c6b786faf522a1cb5b214e9070553e3a690ca6.tar.gz android_packages_apps_Snap-77c6b786faf522a1cb5b214e9070553e3a690ca6.tar.bz2 android_packages_apps_Snap-77c6b786faf522a1cb5b214e9070553e3a690ca6.zip | |
Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/filtershow_editor_panel.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml index e4bcfc805..6822d987b 100644 --- a/res/layout/filtershow_editor_panel.xml +++ b/res/layout/filtershow_editor_panel.xml @@ -76,7 +76,7 @@ android:orientation="horizontal" android:visibility="visible" > - <Button + <com.android.gallery3d.filtershow.editors.SwapButton android:id="@+id/applyEffect" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -86,6 +86,7 @@ android:text="@string/apply_effect" android:textSize="18dip" android:drawableRight="@drawable/filtershow_menu_marker"/> + </LinearLayout> <ImageView |