summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2012-10-11 21:04:41 -0700
committerJohn Hoford <hoford@google.com>2012-10-11 21:22:13 -0700
commit9091fa91be360ba04fccda1eab2b7a5f676c3a82 (patch)
treed8bc8b9d6e662b19ad1800bfa4725d4bc6e37890 /res/layout
parente63a412af626681fd7a0acf8f537abdb75e700c0 (diff)
downloadandroid_packages_apps_Snap-9091fa91be360ba04fccda1eab2b7a5f676c3a82.tar.gz
android_packages_apps_Snap-9091fa91be360ba04fccda1eab2b7a5f676c3a82.tar.bz2
android_packages_apps_Snap-9091fa91be360ba04fccda1eab2b7a5f676c3a82.zip
layouts, image icons, and layer behavour
bug:7328726 Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/filtershow_activity.xml28
1 files changed, 26 insertions, 2 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index f9d04aacc..0e157328d 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -17,7 +17,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent"
+ android:background="@color/background_main_toolbar" >
<LinearLayout
android:id="@+id/imageStatePanel"
@@ -170,6 +171,15 @@
android:visibility="gone" />
</FrameLayout>
+ <com.android.gallery3d.filtershow.CenteredLinearLayout
+ xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
+ android:id="@+id/mainPanel"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ custom:max_width="600dip"
+ android:orientation="vertical">
+
<FrameLayout
android:id="@+id/secondRowPanel"
android:layout_width="fill_parent"
@@ -235,7 +245,8 @@
android:id="@+id/listGeometry"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:orientation="horizontal" >
+ android:layout_gravity="center"
+ android:orientation="horizontal">
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
android:id="@+id/straightenButton"
@@ -349,6 +360,15 @@
</HorizontalScrollView>
</FrameLayout>
+ <com.android.gallery3d.filtershow.CenteredLinearLayout
+ xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
+ android:id="@+id/mainPanel"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ custom:max_width="400dip"
+ android:orientation="vertical">
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dip"
@@ -393,6 +413,10 @@
android:scaleType="centerInside"
android:src="@drawable/ic_photoeditor_color" />
</LinearLayout>
+
+ </com.android.gallery3d.filtershow.CenteredLinearLayout>
+
+ </com.android.gallery3d.filtershow.CenteredLinearLayout>
</LinearLayout>
</FrameLayout>