Merge "Tidy up autofill UI."
diff --git a/res/layout/autofill_settings_fragment.xml b/res/layout/autofill_settings_fragment.xml
index b0e0f53..ca74e9a 100644
--- a/res/layout/autofill_settings_fragment.xml
+++ b/res/layout/autofill_settings_fragment.xml
@@ -16,8 +16,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
+ android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -27,8 +26,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:text="@string/pref_autofill_profile_editor" />
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/autofill_profile_editor_heading" />
<View
android:layout_height="20dip"
@@ -37,52 +36,47 @@
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
android:shrinkColumns="1"
android:stretchColumns="1">
- <TableRow
- android:layout_height="match_parent"
- android:layout_weight="1">
+ <TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:padding="10dip"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/autofill_profile_editor_name" />
<EditText android:id="@+id/autofill_profile_editor_name_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:gravity="center_vertical"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textPersonName|textCapWords"
android:singleLine="true" />
</TableRow>
- <TableRow
- android:layout_height="match_parent"
- android:layout_weight="1">
+ <TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:padding="10dip"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/autofill_profile_editor_company_name" />
<EditText android:id="@+id/autofill_profile_editor_company_name_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:gravity="center_vertical"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textCapWords"
android:singleLine="true" />
</TableRow>
- <TableRow
- android:layout_height="match_parent"
- android:layout_weight="1">
+ <TableRow>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:layout_margin="2dip"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@@ -98,20 +92,17 @@
android:text="@string/autofill_profile_editor_address_line_1_hint" />
</LinearLayout>
<EditText android:id="@+id/autofill_profile_editor_address_line_1_edit"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="10dip"
+ android:gravity="center_vertical"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textCapWords"
android:singleLine="true" />
</TableRow>
- <TableRow
- android:layout_height="match_parent"
- android:layout_weight="1">
+ <TableRow>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:layout_margin="2dip"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@@ -129,115 +120,110 @@
<EditText android:id="@+id/autofill_profile_editor_address_line_2_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:gravity="bottom"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textCapWords"
android:singleLine="true" />
</TableRow>
- <TableRow
- android:layout_height="match_parent"
- android:layout_weight="1">
+ <TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:padding="10dip"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/autofill_profile_editor_city" />
<EditText android:id="@+id/autofill_profile_editor_city_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:gravity="center_vertical"
+ android:layout_margin="2dip"
android:inputType="textCapWords"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true" />
</TableRow>
- <TableRow
- android:layout_height="match_parent"
- android:layout_weight="1">
+ <TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:padding="10dip"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/autofill_profile_editor_state" />
<EditText android:id="@+id/autofill_profile_editor_state_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:gravity="center_vertical"
+ android:layout_margin="2dip"
android:inputType="textCapWords"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true" />
</TableRow>
- <TableRow
- android:layout_height="match_parent"
- android:layout_weight="1">
+ <TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:padding="10dip"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/autofill_profile_editor_zip_code" />
<EditText android:id="@+id/autofill_profile_editor_zip_code_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:gravity="center_vertical"
+ android:layout_margin="2dip"
android:inputType="textCapCharacters"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true" />
</TableRow>
- <TableRow
- android:layout_height="match_parent"
- android:layout_weight="1">
+ <TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:padding="10dip"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/autofill_profile_editor_country" />
<EditText android:id="@+id/autofill_profile_editor_country_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:gravity="center_vertical"
+ android:layout_margin="2dip"
android:inputType="textCapWords"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true" />
</TableRow>
- <TableRow
- android:layout_height="match_parent"
- android:layout_weight="1">
+ <TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:padding="10dip"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/autofill_profile_editor_phone_number" />
<EditText android:id="@+id/autofill_profile_editor_phone_number_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:gravity="center_vertical"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
android:phoneNumber="true" />
</TableRow>
- <TableRow
- android:layout_height="match_parent"
- android:layout_weight="1">
+ <TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:padding="10dip"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/autofill_profile_editor_email_address" />
<EditText android:id="@+id/autofill_profile_editor_email_address_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
+ android:gravity="center_vertical"
+ android:layout_margin="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:inputType="textEmailAddress"
android:singleLine="true" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b1c04dc..c6adaef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -370,6 +370,8 @@
<!-- Summary for the AutoFill Settings preference [CHAR-LIMIT=none] -->
<string name="pref_autofill_profile_editor_summary">Set up & manage data for AutoFilled forms</string>
+ <!-- Heading for the AutoFill profile editor to tell the user what AutoFill does and why they should fill out the profile. [CHAR-LIMIT=None] -->
+ <string name="autofill_profile_editor_heading">AutoFill will use your profile to help you complete web forms in a single click.</string>
<!-- String for the user's full name in the AutoFill profile editor. [CHAR-LIMIT=32] -->
<string name="autofill_profile_editor_name">Full name:</string>
<!-- String for the user's e-mail address in the AutoFill profile editor. [CHAR-LIMIT=32] -->
@@ -402,7 +404,7 @@
<!-- Toast message displayed when the profile has been successfully deleted [CHAR-LIMIT=none] -->
<string name="autofill_profile_successful_delete">Profile deleted</string>
<!-- Button text to delete all the AutoFill profile data [CHAR-LIMIT=20] -->
- <string name="autofill_profile_editor_delete_profile">Delete profile data</string>
+ <string name="autofill_profile_editor_delete_profile">Delete profile</string>
<!-- Text on a dialog shown to the user when they are prompted to set up the autofill feature [CHAR-LIMIT=NONE] -->
<string name="autofill_setup_dialog_message">Browser can automatically complete web forms like this one. Would you like to set up your profile?</string>