diff options
author | Ben Murdoch <benm@google.com> | 2011-06-16 19:47:08 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-17 22:04:27 +0100 |
commit | 815752af4a61faac210150db4084944fa0f4af33 (patch) | |
tree | c498410c2c8b58f585dc87575678d705526ce8b4 | |
parent | f43990eed0a2b97f181c44fd03271f1844a8d133 (diff) | |
download | packages_apps_browser-815752af4a61faac210150db4084944fa0f4af33.zip packages_apps_browser-815752af4a61faac210150db4084944fa0f4af33.tar.gz packages_apps_browser-815752af4a61faac210150db4084944fa0f4af33.tar.bz2 |
Fix up AutoFill profile editor UI in portrait mode
Create layout-port version of the autofill profile editor that extends
vertically rather than horizontally.
In both portrait and landscape, make the "Save profile" button
always visible, remove the "cancel" button as there are already several
ways to leave the activity without saving changes and move the "Delete
profile" button to the options menu.
Change-Id: I3b03c998bc8cb005f066733a3b6979a03396f31f
-rw-r--r-- | res/layout-port/autofill_settings_fragment.xml | 231 | ||||
-rw-r--r-- | res/layout/autofill_settings_fragment.xml | 442 | ||||
-rw-r--r-- | res/menu/autofill_profile_editor.xml | 22 | ||||
-rw-r--r-- | src/com/android/browser/AutoFillSettingsFragment.java | 65 |
4 files changed, 503 insertions, 257 deletions
diff --git a/res/layout-port/autofill_settings_fragment.xml b/res/layout-port/autofill_settings_fragment.xml new file mode 100644 index 0000000..63dba4d --- /dev/null +++ b/res/layout-port/autofill_settings_fragment.xml @@ -0,0 +1,231 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1"> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <View + android:layout_height="10dip" + android:layout_width="match_parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/autofill_profile_editor_heading" /> + + <View + android:layout_height="12dip" + android:layout_width="match_parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:inputType="textPersonName|textCapWords" + android:singleLine="true" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:inputType="textCapWords" + android:singleLine="true" /> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="2dip" + android:orientation="vertical"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/autofill_profile_editor_address_line_1" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceSmall" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:inputType="textCapWords" + android:singleLine="true" /> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="2dip" + android:orientation="vertical"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/autofill_profile_editor_address_line_2" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/autofill_profile_editor_address_line_2_hint" /> + </LinearLayout> + <EditText android:id="@+id/autofill_profile_editor_address_line_2_edit" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="bottom" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:inputType="textCapWords" + android:singleLine="true" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:inputType="textCapWords" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:inputType="textCapWords" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:inputType="textCapCharacters" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:inputType="textCapWords" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" + android:phoneNumber="true" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:inputType="textEmailAddress" + android:singleLine="true" /> + </LinearLayout> + </ScrollView> + + <View + android:layout_height="12dip" + android:layout_width="match_parent" /> + + <Button + android:id="@+id/autofill_profile_editor_save_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/autofill_profile_editor_save_profile" + android:textAppearance="?android:attr/textAppearanceMedium" /> + +</LinearLayout> diff --git a/res/layout/autofill_settings_fragment.xml b/res/layout/autofill_settings_fragment.xml index b92c149..8c90dd7 100644 --- a/res/layout/autofill_settings_fragment.xml +++ b/res/layout/autofill_settings_fragment.xml @@ -13,256 +13,246 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="0px" + android:layout_weight="1"> - <View - android:layout_height="10dip" - android:layout_width="match_parent" /> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/autofill_profile_editor_heading" /> + <View + android:layout_height="10dip" + android:layout_width="match_parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/autofill_profile_editor_heading" /> - <View - android:layout_height="12dip" - android:layout_width="match_parent" /> + <View + android:layout_height="12dip" + android:layout_width="match_parent" /> - <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:shrinkColumns="1" - android:stretchColumns="1"> - <TableRow> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - 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:gravity="center_vertical" - android:layout_margin="2dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:inputType="textPersonName|textCapWords" - android:singleLine="true" /> - </TableRow> - <TableRow> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - 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:gravity="center_vertical" - android:layout_margin="2dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:inputType="textCapWords" - android:singleLine="true" /> - </TableRow> - <TableRow> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="2dip" - android:orientation="vertical"> + <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:shrinkColumns="1" + android:stretchColumns="1"> + <TableRow> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_vertical" + android:layout_margin="2dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/autofill_profile_editor_address_line_1" /> - <TextView + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:inputType="textPersonName|textCapWords" + android:singleLine="true" /> + </TableRow> + <TableRow> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="@string/autofill_profile_editor_address_line_1_hint" /> - </LinearLayout> - <EditText android:id="@+id/autofill_profile_editor_address_line_1_edit" - android:gravity="center_vertical" - android:layout_margin="2dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:inputType="textCapWords" - android:singleLine="true" /> - </TableRow> - <TableRow> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="2dip" - android:orientation="vertical"> + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:inputType="textCapWords" + android:singleLine="true" /> + </TableRow> + <TableRow> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="2dip" + android:orientation="vertical"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/autofill_profile_editor_address_line_1" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceSmall" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:inputType="textCapWords" + android:singleLine="true" /> + </TableRow> + <TableRow> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="2dip" + android:orientation="vertical"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/autofill_profile_editor_address_line_2" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/autofill_profile_editor_address_line_2_hint" /> + </LinearLayout> + <EditText android:id="@+id/autofill_profile_editor_address_line_2_edit" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="bottom" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:inputType="textCapWords" + android:singleLine="true" /> + </TableRow> + <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:inputType="textCapWords" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" /> + </TableRow> + <TableRow> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_vertical" + android:layout_margin="2dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/autofill_profile_editor_address_line_2" /> - <TextView + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:inputType="textCapWords" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" /> + </TableRow> + <TableRow> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="@string/autofill_profile_editor_address_line_2_hint" /> - </LinearLayout> - <EditText android:id="@+id/autofill_profile_editor_address_line_2_edit" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="bottom" - android:layout_margin="2dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:inputType="textCapWords" - android:singleLine="true" /> - </TableRow> - <TableRow> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - 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:gravity="center_vertical" - android:layout_margin="2dip" - android:inputType="textCapWords" - android:textAppearance="?android:attr/textAppearanceMedium" - android:singleLine="true" /> - </TableRow> - <TableRow> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - 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:gravity="center_vertical" - android:layout_margin="2dip" - android:inputType="textCapWords" - android:textAppearance="?android:attr/textAppearanceMedium" - android:singleLine="true" /> - </TableRow> - <TableRow> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - 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:gravity="center_vertical" - android:layout_margin="2dip" - android:inputType="textCapCharacters" - android:textAppearance="?android:attr/textAppearanceMedium" - android:singleLine="true" /> - </TableRow> - <TableRow> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - 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:gravity="center_vertical" - android:layout_margin="2dip" - android:inputType="textCapWords" - android:textAppearance="?android:attr/textAppearanceMedium" - android:singleLine="true" /> - </TableRow> - <TableRow> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - 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:gravity="center_vertical" - android:layout_margin="2dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:singleLine="true" - android:phoneNumber="true" /> - </TableRow> - <TableRow> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - 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:gravity="center_vertical" - android:layout_margin="2dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:inputType="textEmailAddress" - android:singleLine="true" /> - </TableRow> - </TableLayout> + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:inputType="textCapCharacters" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" /> + </TableRow> + <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:inputType="textCapWords" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" /> + </TableRow> + <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" + android:phoneNumber="true" /> + </TableRow> + <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + 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:gravity="center_vertical" + android:layout_margin="2dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:inputType="textEmailAddress" + android:singleLine="true" /> + </TableRow> + </TableLayout> + </LinearLayout> + </ScrollView> - <View - android:layout_height="12dip" - android:layout_width="match_parent" /> + <View + android:layout_height="12dip" + android:layout_width="match_parent" /> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:gravity="center"> - <Button - android:id="@+id/autofill_profile_editor_save_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/autofill_profile_editor_save_profile" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <Button + android:id="@+id/autofill_profile_editor_save_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/autofill_profile_editor_save_profile" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <Button - android:id="@+id/autofill_profile_editor_cancel_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/cancel" - android:textAppearance="?android:attr/textAppearanceMedium" /> +</LinearLayout> - <Button - android:id="@+id/autofill_profile_editor_delete_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/autofill_profile_editor_delete_profile" - android:textAppearance="?android:attr/textAppearanceMedium" /> - </LinearLayout> - </LinearLayout> -</ScrollView> diff --git a/res/menu/autofill_profile_editor.xml b/res/menu/autofill_profile_editor.xml new file mode 100644 index 0000000..4e746e5 --- /dev/null +++ b/res/menu/autofill_profile_editor.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/autofill_profile_editor_delete_profile_menu_id" + android:title="@string/autofill_profile_editor_delete_profile" + android:icon="@android:drawable/ic_menu_delete" + android:showAsAction="ifRoom|withText" /> +</menu> diff --git a/src/com/android/browser/AutoFillSettingsFragment.java b/src/com/android/browser/AutoFillSettingsFragment.java index e87645e..b282789 100644 --- a/src/com/android/browser/AutoFillSettingsFragment.java +++ b/src/com/android/browser/AutoFillSettingsFragment.java @@ -28,6 +28,9 @@ import android.view.View; import android.view.ViewGroup; import android.view.View.OnClickListener; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.inputmethod.InputMethodManager; import android.webkit.WebSettings.AutoFillProfile; import android.widget.Button; @@ -131,10 +134,41 @@ public class AutoFillSettingsFragment extends Fragment { @Override public void onCreate(Bundle savedState) { super.onCreate(savedState); + setHasOptionsMenu(true); mSettings = BrowserSettings.getInstance(); } @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + inflater.inflate(R.menu.autofill_profile_editor, menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == R.id.autofill_profile_editor_delete_profile_menu_id) { + // Clear the UI. + mFullNameEdit.setText(""); + mEmailEdit.setText(""); + mCompanyEdit.setText(""); + mAddressLine1Edit.setText(""); + mAddressLine2Edit.setText(""); + mCityEdit.setText(""); + mStateEdit.setText(""); + mZipEdit.setText(""); + mCountryEdit.setText(""); + mPhoneEdit.setText(""); + + // Update browser settings and native with a null profile. This will + // trigger the current profile to get deleted from the DB. + mSettings.setAutoFillProfile(null, + mHandler.obtainMessage(PROFILE_DELETED_MSG)); + updateButtonState(); + return true; + } + return false; + } + + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.autofill_settings_fragment, container, false); @@ -185,37 +219,6 @@ public class AutoFillSettingsFragment extends Fragment { } }); - Button deleteButton = (Button)v.findViewById(R.id.autofill_profile_editor_delete_button); - deleteButton.setOnClickListener(new OnClickListener() { - public void onClick(View button) { - // Clear the UI. - mFullNameEdit.setText(""); - mEmailEdit.setText(""); - mCompanyEdit.setText(""); - mAddressLine1Edit.setText(""); - mAddressLine2Edit.setText(""); - mCityEdit.setText(""); - mStateEdit.setText(""); - mZipEdit.setText(""); - mCountryEdit.setText(""); - mPhoneEdit.setText(""); - - // Update browser settings and native with a null profile. This will - // trigger the current profile to get deleted from the DB. - mSettings.setAutoFillProfile(null, - mHandler.obtainMessage(PROFILE_DELETED_MSG)); - - updateButtonState(); - } - }); - - Button cancelButton = (Button)v.findViewById(R.id.autofill_profile_editor_cancel_button); - cancelButton.setOnClickListener(new OnClickListener() { - public void onClick(View button) { - closeEditor(); - } - }); - // Populate the text boxes with any pre existing AutoFill data. AutoFillProfile activeProfile = mSettings.getAutoFillProfile(); if (activeProfile != null) { |