From 534dcbc5a0399ff88f535378b7c2c934a8636b16 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Tue, 29 Sep 2009 17:18:28 -0700
Subject: [PATCH] Simplify the layout of all activities with a title and a
 progress bar.

Change-Id: I2e0695779e5b4bccc4fc2e790bbaf5466e017fb2
---
 core/res/res/layout/screen_progress.xml | 99 ++++++++++++-------------
 1 file changed, 48 insertions(+), 51 deletions(-)

diff --git a/core/res/res/layout/screen_progress.xml b/core/res/res/layout/screen_progress.xml
index e3347e4325fba..477cadb6015f8 100644
--- a/core/res/res/layout/screen_progress.xml
+++ b/core/res/res/layout/screen_progress.xml
@@ -20,58 +20,55 @@
 This is the basic layout for a screen, with all of its features enabled.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:fitsSystemWindows="true"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
 >
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+    <RelativeLayout android:id="@android:id/title_container" 
+        style="?android:attr/windowTitleBackgroundStyle"
+        android:layout_width="fill_parent" 
+        android:layout_height="?android:attr/windowTitleSize"
     >
-        <RelativeLayout android:id="@android:id/title_container" 
-            style="?android:attr/windowTitleBackgroundStyle"
-            android:layout_width="fill_parent" 
-            android:layout_height="?android:attr/windowTitleSize"
-        >
-            <ProgressBar android:id="@+android:id/progress_circular"
-                style="?android:attr/progressBarStyleSmallTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dip"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:visibility="gone"
-                android:max="10000"
-            />
-            <ProgressBar android:id="@+android:id/progress_horizontal"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="2dip"
-                android:layout_alignParentLeft="true"
-                android:layout_toLeftOf="@android:id/progress_circular"
-                android:layout_centerVertical="true"
-                android:visibility="gone"
-                android:max="10000" 
-            />
-            <TextView android:id="@android:id/title"
-                style="?android:attr/windowTitleStyle"
-                android:layout_width="fill_parent" 
-                android:layout_height="fill_parent"
-                android:layout_alignParentLeft="true"
-                android:layout_toLeftOf="@android:id/progress_circular"
-                android:background="@null"
-                android:fadingEdge="horizontal"
-                android:gravity="center_vertical"
-                android:scrollHorizontally="true" 
-            />
-        </RelativeLayout>
-        <FrameLayout android:id="@android:id/content"
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:foregroundGravity="fill_horizontal|top"
-            android:foreground="?android:attr/windowContentOverlay"
+        <ProgressBar android:id="@+android:id/progress_circular"
+            style="?android:attr/progressBarStyleSmallTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dip"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            android:max="10000"
         />
-    </LinearLayout>
-</FrameLayout>
+        <ProgressBar android:id="@+android:id/progress_horizontal"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="2dip"
+            android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@android:id/progress_circular"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            android:max="10000" 
+        />
+        <TextView android:id="@android:id/title"
+            style="?android:attr/windowTitleStyle"
+            android:layout_width="fill_parent" 
+            android:layout_height="fill_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@android:id/progress_circular"
+            android:background="@null"
+            android:fadingEdge="horizontal"
+            android:gravity="center_vertical"
+            android:scrollHorizontally="true" 
+        />
+    </RelativeLayout>
+    <FrameLayout android:id="@android:id/content"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:foregroundGravity="fill_horizontal|top"
+        android:foreground="?android:attr/windowContentOverlay"
+    />
+</LinearLayout>