commit ba1ba19c27e90694f74985b37b7bcaea6c023621
author nicolasroard <nicolasroard@google.com> Sat Sep 29 00:17:09 2012 -0700
committer nicolasroard <nicolasroard@google.com> Sat Sep 29 16:58:46 2012 -0700
tree 218b076aa0d4846485a3339910f25d4cf6bee259
parent 7a9f7461af80edd31e5592d78bc7c6086cbfc3d7

Fix border bug and filter application
- fix layout (use framelayout)
- fix copy imagepreset
- added a current image state panel
- remove title for border images for now

bug:7256090
bug:7249672
bug:7234317
bug:7225150

Change-Id: I958628a1604c7e436e5d121556c8744f5748b1ec

res/layout/filtershow_activity.xml

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 06583d8..0dead60 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -14,16 +14,44 @@
      limitations under the License.
 -->
 
-<AbsoluteLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
     <LinearLayout
+        android:id="@+id/imageStatePanel"
+        android:layout_width="200dip"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:visibility="invisible"
+        android:layout_gravity="right">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:gravity="center"
+            android:padding="2dip"
+            android:text="@string/imageState"
+            android:textColor="@android:color/white"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <ListView
+            android:id="@+id/imageStateList"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+        </ListView>
+    </LinearLayout>
+
+    <LinearLayout
         android:id="@+id/historyPanel"
         android:layout_width="200dip"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:visibility="invisible" >
+        android:visibility="invisible"
+        android:layout_gravity="right">
 
         <TextView
             android:layout_width="match_parent"
@@ -49,6 +77,7 @@
             android:orientation="horizontal" >
 
             <Button
+                android:gravity="center"
                 android:id="@+id/resetOperationsButton"
                 style="@style/FilterShowHistoryButton"
                 android:text="@string/reset" />
@@ -56,6 +85,7 @@
             <Button
                 android:id="@+id/saveOperationsButton"
                 style="@style/FilterShowHistoryButton"
+                android:visibility="gone"
                 android:text="@string/save" />
         </LinearLayout>
     </LinearLayout>
@@ -286,4 +316,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</AbsoluteLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file