Merge "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." into gb-ub-photos-arches

3 files changed, 65 insertions, 61 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
diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml
index 44a11e7db..ba0a8bcf4 100644
--- a/res/menu/filtershow_activity_menu.xml
+++ b/res/menu/filtershow_activity_menu.xml
@@ -1,5 +1,29 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_settings"
-        android:title="@string/menu_settings"
-        android:orderInCategory="100" />
-</menu>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/menu_share"
+        android:actionProviderClass="android.widget.ShareActionProvider"
+        android:showAsAction="ifRoom"
+        android:enabled="false"
+        android:title="@string/share"/>
+    <item
+        android:id="@+id/undoButton"
+        android:icon="@drawable/filtershow_button_undo"
+        android:showAsAction="ifRoom"
+        android:title="@string/filtershow_undo"/>
+    <item
+        android:id="@+id/redoButton"
+        android:icon="@drawable/filtershow_button_redo"
+        android:showAsAction="ifRoom"
+        android:title="@string/filtershow_redo"/>
+    <item
+        android:id="@+id/operationsButton"
+        android:icon="@drawable/filtershow_button_operations"
+        android:showAsAction="ifRoom"
+        android:title="@string/show_history_panel"/>
+    <item
+        android:id="@+id/menu_settings"
+        android:enabled="false"
+        android:orderInCategory="100"
+        android:title="@string/menu_settings"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 3a0a3afba..dd27a288c 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -22,9 +22,11 @@
     <string name="save">Save</string>
     <string name="done">Done</string>
     <string name="history">History</string>
+    <string name="show_history_panel">Show History</string>
+    <string name="hide_history_panel">Hide History</string>
     <string name="reset">Reset</string>
-    <string name="undo">Undo</string>
-    <string name="redo">Redo</string>
+    <string name="filtershow_undo">Undo</string>
+    <string name="filtershow_redo">Redo</string>
     <string name="straighten">Straighten</string>
     <string name="crop">Crop</string>
     <string name="rotate">Rotate</string>