am 1eba4b5: Merge branch \'readonly-p4-donut\' into donut

Merge commit '1eba4b57f3846c8605654254cd6be97d1dc7d318'

* commit '1eba4b57f3846c8605654254cd6be97d1dc7d318':
  AI 148485: Clean up the scrollview layout so the button bar is always on the
This commit is contained in:
Andy Stadler 2009-05-07 14:34:47 -07:00 committed by The Android Open Source Project
commit c9d7c9c977
2 changed files with 2 additions and 1 deletions

View File

@ -18,6 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:fillViewport="true"
android:scrollbarStyle="outsideInset"> android:scrollbarStyle="outsideInset">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"

View File

@ -298,7 +298,7 @@
<!-- On "Exchange" setup screen, the name of the server --> <!-- On "Exchange" setup screen, the name of the server -->
<string name="account_setup_exchange_server_label">Exchange Server</string> <string name="account_setup_exchange_server_label">Exchange Server</string>
<!-- On "Exchange" setup screen, the domain name label --> <!-- 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 --> <!-- On "Exchange" setup screen, the domain name hint -->
<string name="account_setup_exchange_domain_hint">Enter domain here</string> <string name="account_setup_exchange_domain_hint">Enter domain here</string>
<!-- On "Exchange" setup screen, the use-SSL checkbox label --> <!-- On "Exchange" setup screen, the use-SSL checkbox label -->