diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-09-27 20:54:48 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2012-09-27 21:41:36 -0700 |
| commit | 9594c8d3e0dd0d6157710ceae1d1deea8e566db4 (patch) | |
| tree | 32a18b0237f91fc3024d1d375d6824db9323df3c /res/layout/filtershow_activity.xml | |
| parent | 863b4e65d172a19111f46e43f97e7e41927a3bc7 (diff) | |
| download | android_packages_apps_Gallery2-9594c8d3e0dd0d6157710ceae1d1deea8e566db4.tar.gz android_packages_apps_Gallery2-9594c8d3e0dd0d6157710ceae1d1deea8e566db4.tar.bz2 android_packages_apps_Gallery2-9594c8d3e0dd0d6157710ceae1d1deea8e566db4.zip | |
Use an actionbar
- move the "show original" button to the bottom left
- move the history button to the overflow menu for now
- add a reset item in the overflow menu.
bug:7234317
bug:7233975
bug:7233986
Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
Diffstat (limited to 'res/layout/filtershow_activity.xml')
| -rw-r--r-- | res/layout/filtershow_activity.xml | 86 |
1 files changed, 32 insertions, 54 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 1521585ad..42aba0cb9 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -67,65 +67,43 @@ android:layerType="hardware" android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="48dip" > + <FrameLayout + android:layout_weight="1" + android:layout_width="match_parent" + android:layout_height="wrap_content" > - <Button - android:id="@+id/saveButton" - style="@style/FilterShowTopButton" - android:layout_weight="1" - android:gravity="center_vertical|left" - android:text="@string/done" /> + <com.android.gallery3d.filtershow.imageshow.ImageShow + android:id="@+id/imageShow" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> - <ImageButton - android:id="@+id/showOriginalButton" - style="@style/FilterShowTopButton" - android:src="@drawable/filtershow_button_show_original" /> + <com.android.gallery3d.filtershow.imageshow.ImageStraighten + android:id="@+id/imageStraighten" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> - <ImageButton - android:id="@+id/undoButton" - style="@style/FilterShowTopButton" - android:src="@drawable/filtershow_button_undo" /> + <com.android.gallery3d.filtershow.ui.ImageCurves + android:id="@+id/imageCurves" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> - <ImageButton - android:id="@+id/redoButton" - style="@style/FilterShowTopButton" - android:src="@drawable/filtershow_button_redo" /> + <com.android.gallery3d.filtershow.imageshow.ImageBorder + android:id="@+id/imageBorder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> <ImageButton - android:id="@+id/operationsButton" - style="@style/FilterShowTopButton" - android:src="@drawable/filtershow_button_operations" /> - - </LinearLayout> - - <com.android.gallery3d.filtershow.imageshow.ImageShow - android:id="@+id/imageShow" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" /> - - <com.android.gallery3d.filtershow.imageshow.ImageStraighten - android:id="@+id/imageStraighten" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:visibility="gone" /> - - <com.android.gallery3d.filtershow.ui.ImageCurves - android:id="@+id/imageCurves" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:visibility="gone" /> - - <com.android.gallery3d.filtershow.imageshow.ImageBorder - android:id="@+id/imageBorder" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:visibility="gone" /> + android:id="@+id/showOriginalButton" + android:layout_height="64dip" + android:layout_width="64dip" + android:scaleType="centerInside" + android:layout_gravity="bottom" + android:src="@drawable/filtershow_button_show_original" /> + + </FrameLayout> <HorizontalScrollView android:id="@+id/fxList" @@ -320,4 +298,4 @@ </LinearLayout> </LinearLayout> -</AbsoluteLayout> +</AbsoluteLayout>
\ No newline at end of file |