diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-09-29 00:17:09 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2012-09-29 16:58:46 -0700 |
| commit | bf93da72576b28f4e9dfb27f8f3fef702c8ae82d (patch) | |
| tree | 5ca0b579c4f9f8f910282adb961538a075418af8 /res/layout/filtershow_activity.xml | |
| parent | 0c3203f1789df3f8bd772dfd655e73b44636b629 (diff) | |
| download | android_packages_apps_Gallery2-bf93da72576b28f4e9dfb27f8f3fef702c8ae82d.tar.gz android_packages_apps_Gallery2-bf93da72576b28f4e9dfb27f8f3fef702c8ae82d.tar.bz2 android_packages_apps_Gallery2-bf93da72576b28f4e9dfb27f8f3fef702c8ae82d.zip | |
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
Diffstat (limited to 'res/layout/filtershow_activity.xml')
| -rw-r--r-- | res/layout/filtershow_activity.xml | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 06583d8f0..0dead607f 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 |