commit 8086db108d4eb62d64dd210b0b69f8a0f2ada370
author John Hoford <hoford@google.com> Thu Oct 11 21:33:48 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 11 21:33:48 2012 -0700
tree ecd2b014e823a1b353524adde386f187cae88892
parent ae050f71e01a6f686f068ca3af9250a9b5a7eda5
parent 9091fa91be360ba04fccda1eab2b7a5f676c3a82

am ea5df36a: layouts, image icons, and layer behavour

* commit 'ea5df36ac1cdfbb569e6ba725c2df433d614d0f5':
  layouts, image icons, and layer behavour

res/layout/filtershow_activity.xml

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index f9d04aa..0e15732 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>

res/values/attrs.xml

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 94d5b72..f8ebd05 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -18,4 +18,7 @@
         <attr name="listPreferredItemHeightSmall" format="dimension" />
         <attr name="switchStyle" format="reference" />
     </declare-styleable>
+    <declare-styleable name="CenteredLinearLayout">
+        <attr name="max_width" format="dimension" />
+    </declare-styleable>
 </resources>