From 3cf41764e3fcd6087c88ba6ecd2d63484fb6ef9a Mon Sep 17 00:00:00 2001
From: Andy Stadler <nobody@android.com>
Date: Thu, 7 May 2009 14:30:53 -0700
Subject: [PATCH] AI 148485: Clean up the scrollview layout so the button bar
 is always on the   bottom of the screen.   Also removed an extra ':' in a
 string on the screen (none of the other   label strings have ':').  
 BUG=1740626

Automated import of CL 148485
---
 res/layout/account_setup_exchange.xml | 1 +
 res/values/strings.xml                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/layout/account_setup_exchange.xml b/res/layout/account_setup_exchange.xml
index 2a6c65124..70ea7500f 100644
--- a/res/layout/account_setup_exchange.xml
+++ b/res/layout/account_setup_exchange.xml
@@ -18,6 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:fillViewport="true"
     android:scrollbarStyle="outsideInset">
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0109d31bf..88c5c767c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -298,7 +298,7 @@
     <!-- On "Exchange" setup screen, the name of the server -->
     <string name="account_setup_exchange_server_label">Exchange Server</string>
     <!-- On "Exchange" setup screen, the domain name label -->
-    <string name="account_setup_exchange_domain_label">Domain:</string>
+    <string name="account_setup_exchange_domain_label">Domain</string>
     <!-- On "Exchange" setup screen, the domain name hint -->
     <string name="account_setup_exchange_domain_hint">Enter domain here</string>
     <!-- On "Exchange" setup screen, the use-SSL checkbox label -->