ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix account setup layouts

Browse Source 
These were not working on some screens due to portrait/landscape
layout issues.  The worst cases were the "basics" screen and "exchange",
but I cleaned up all of the screens that had similar issues.

Resolves bug 2070902 which made it difficult to create accounts on
some devices.
This commit is contained in:
Andrew Stadler 2009-08-21 16:24:16 -07:00
parent 8a34ba9f83
commit f330d1221a
7 changed files with 466 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
res/layout/account_setup_basics.xml
View File

@ -14,9 +14,21 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView 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" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -40,8 +52,7 @@
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
android:imeOptions="actionNext" android:imeOptions="actionNext"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent" />
/>
<EditText <EditText
android:id="@+id/account_password" android:id="@+id/account_password"
android:hint="@string/account_setup_basics_password_hint" android:hint="@string/account_setup_basics_password_hint"
@ -49,25 +60,23 @@
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:nextFocusDown="@+id/next" android:nextFocusDown="@+id/next" />
/>
<CheckBox <CheckBox
android:id="@+id/account_default" android:id="@+id/account_default"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:text="@string/account_setup_basics_default_label" android:text="@string/account_setup_basics_default_label"
android:visibility="gone" android:visibility="gone" />
/>
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="1" />
/> </LinearLayout>
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="54dip" android:layout_height="54dip"
android:background="@android:drawable/bottom_bar" android:background="@android:drawable/bottom_bar" >
>
<Button <Button
android:id="@+id/manual_setup" android:id="@+id/manual_setup"
android:text="@string/account_setup_basics_manual_setup_action" android:text="@string/account_setup_basics_manual_setup_action"
@ -75,8 +84,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:minWidth="@dimen/button_minWidth" android:minWidth="@dimen/button_minWidth"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true" />
/>
<Button <Button
android:id="@+id/next" android:id="@+id/next"
android:text="@string/next_action" android:text="@string/next_action"
@ -85,7 +93,7 @@
android:minWidth="@dimen/button_minWidth" android:minWidth="@dimen/button_minWidth"
android:drawableRight="@drawable/button_indicator_next" android:drawableRight="@drawable/button_indicator_next"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true" />
/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</ScrollView>

28
res/layout/account_setup_check_settings.xml
View File

@ -14,14 +14,23 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout <ScrollView 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:orientation="vertical"> android:fillViewport="true"
<View android:scrollbarStyle="outsideInset" >
<LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="100sp" /> android:layout_height="fill_parent"
android:orientation="vertical" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="100dip"
android:orientation="vertical" >
<TextView <TextView
android:id="@+id/message" android:id="@+id/message"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -35,10 +44,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
style="?android:attr/progressBarStyleHorizontal" /> style="?android:attr/progressBarStyleHorizontal" />
<View </LinearLayout>
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1" />
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="54dip" android:layout_height="54dip"
@ -51,4 +58,5 @@
android:minWidth="@dimen/button_minWidth" android:minWidth="@dimen/button_minWidth"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</ScrollView>

16
res/layout/account_setup_exchange.xml
View File

@ -19,11 +19,18 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:fillViewport="true" android:fillViewport="true"
android:scrollbarStyle="outsideInset"> android:scrollbarStyle="outsideInset" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
<TextView <TextView
android:text="@string/account_setup_incoming_username_label" android:text="@string/account_setup_incoming_username_label"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -80,11 +87,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:text="@string/account_setup_exchange_ssl_label" /> android:text="@string/account_setup_exchange_ssl_label" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1" />
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="54dip" android:layout_height="54dip"

18
res/layout/account_setup_incoming.xml
View File

@ -18,11 +18,19 @@
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:scrollbarStyle="outsideInset"> android:fillViewport="true"
android:scrollbarStyle="outsideInset" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
<TextView <TextView
android:text="@string/account_setup_incoming_username_label" android:text="@string/account_setup_incoming_username_label"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -114,10 +122,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" /> android:layout_width="fill_parent" />
</LinearLayout> </LinearLayout>
<View </LinearLayout>
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1" />
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="54dip" android:layout_height="54dip"

25
res/layout/account_setup_names.xml
View File

@ -14,11 +14,22 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout <ScrollView 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:orientation="vertical"> android:fillViewport="true"
android:scrollbarStyle="outsideInset" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
<TextView <TextView
android:text="@string/account_setup_names_instructions" android:text="@string/account_setup_names_instructions"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -49,10 +60,7 @@
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" /> android:layout_width="fill_parent" />
<View </LinearLayout>
android:layout_height="0dip"
android:layout_width="fill_parent"
android:layout_weight="1" />
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="54dip" android:layout_height="54dip"
@ -66,4 +74,5 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</ScrollView>

25
res/layout/account_setup_options.xml
View File

@ -14,11 +14,23 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout <ScrollView
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:orientation="vertical"> android:fillViewport="true"
android:scrollbarStyle="outsideInset" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
<TextView <TextView
android:text="@string/account_setup_options_mail_check_frequency_label" android:text="@string/account_setup_options_mail_check_frequency_label"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -58,10 +70,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:text="@string/account_setup_options_sync_contacts_label" android:text="@string/account_setup_options_sync_contacts_label"
android:visibility="gone" /> android:visibility="gone" />
<View </LinearLayout>
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1" />
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="54dip" android:layout_height="54dip"
@ -76,4 +86,5 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</ScrollView>

17
res/layout/account_setup_outgoing.xml
View File

@ -18,11 +18,19 @@
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:scrollbarStyle="outsideInset"> android:fillViewport="true"
android:scrollbarStyle="outsideInset" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
<TextView <TextView
android:text="@string/account_setup_outgoing_smtp_server_label" android:text="@string/account_setup_outgoing_smtp_server_label"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -94,10 +102,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" /> android:layout_width="fill_parent" />
</LinearLayout> </LinearLayout>
<View </LinearLayout>
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1" />
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="54dip" android:layout_height="54dip"