summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-21 04:43:31 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-21 04:43:31 -0700
commit3343af5fdb10ace9e593d042fedcd9b42e322a95 (patch)
treed1dade919d4c39e0b6303186650a521d39bb5bc1 /core
parentf9c7d9a75b2355d8ad8282d9b4cf817c77ea8b10 (diff)
parentaacf80261c54befde21e710ec9e1c2898bdf1ae4 (diff)
downloadframeworks_base-3343af5fdb10ace9e593d042fedcd9b42e322a95.zip
frameworks_base-3343af5fdb10ace9e593d042fedcd9b42e322a95.tar.gz
frameworks_base-3343af5fdb10ace9e593d042fedcd9b42e322a95.tar.bz2
Merge change 1863 into donut
* changes: Center the progress message for GoogleWebContentHelper (bug #1548858).
Diffstat (limited to 'core')
-rw-r--r--core/res/res/layout/google_web_content_helper_layout.xml26
1 files changed, 22 insertions, 4 deletions
diff --git a/core/res/res/layout/google_web_content_helper_layout.xml b/core/res/res/layout/google_web_content_helper_layout.xml
index 40f84bf..546c458 100644
--- a/core/res/res/layout/google_web_content_helper_layout.xml
+++ b/core/res/res/layout/google_web_content_helper_layout.xml
@@ -18,10 +18,28 @@
android:foregroundGravity="center"
android:measureAllChildren="false">
- <!-- Include the indeterminate progress dialog's layout. -->
- <include
- android:id="@+id/progressContainer"
- layout="@android:layout/progress_dialog" />
+ <LinearLayout android:id="@+id/progressContainer"
+ android:orientation="horizontal"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:baselineAligned="false"
+ android:paddingLeft="8dip"
+ android:paddingTop="10dip"
+ android:paddingRight="8dip"
+ android:paddingBottom="10dip">
+
+ <ProgressBar android:id="@android:id/progress"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:max="10000"
+ android:layout_marginRight="12dip" />
+
+ <TextView android:id="@+id/message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical" />
+ </LinearLayout>
<WebView
android:id="@+id/web"