am bf9e5c91: Reconcile with ics-mr0-release
* commit 'bf9e5c9193da5eb1b787a64b03d4a38a2763eb52':
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 60a9336..30b1d6f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,6 +41,8 @@
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+ <uses-permission android:name="android.permission.READ_PROFILE" />
+ <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
<uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
diff --git a/res/layout-port/autofill_settings_fragment.xml b/res/layout-port/autofill_settings_fragment.xml
index 63dba4d..16f674d 100644
--- a/res/layout-port/autofill_settings_fragment.xml
+++ b/res/layout-port/autofill_settings_fragment.xml
@@ -43,35 +43,19 @@
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"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textPersonName|textCapWords" />
+
<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:layout_margin="2dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -91,13 +75,9 @@
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -117,115 +97,50 @@
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
+
<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:layout_margin="2dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
+
<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:layout_margin="2dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
+
<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:layout_margin="2dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapCharacters" />
+
<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:layout_margin="2dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
+
<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:layout_margin="2dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ style="@style/AutofillProfileTextView"
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"
+ style="@style/AutofillProfileEditText"
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"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textEmailAddress" />
</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 8c90dd7..ab23ffb 100644
--- a/res/layout/autofill_settings_fragment.xml
+++ b/res/layout/autofill_settings_fragment.xml
@@ -49,37 +49,19 @@
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"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textPersonName|textCapWords" />
</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"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
</TableRow>
<TableRow>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -101,13 +83,8 @@
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
</TableRow>
<TableRow>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -129,130 +106,59 @@
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
</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"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
</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"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
</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"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapCharacters" />
</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"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textCapWords" />
</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"
+ style="@style/AutofillProfileTextView"
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"
+ style="@style/AutofillProfileEditText"
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"
+ style="@style/AutofillProfileTextView"
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" />
+ style="@style/AutofillProfileEditText"
+ android:inputType="textEmailAddress" />
</TableRow>
</TableLayout>
</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/menu/autofill_profile_editor.xml b/res/menu/autofill_profile_editor.xml
index 4e746e5..9dab635 100644
--- a/res/menu/autofill_profile_editor.xml
+++ b/res/menu/autofill_profile_editor.xml
@@ -15,6 +15,11 @@
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/autofill_profile_editor_save_profile_menu_id"
+ android:title="@string/autofill_profile_editor_save_profile"
+ android:icon="@android:drawable/ic_menu_save"
+ android:showAsAction="ifRoom|withText" />
+
<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"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 76f5264..6fef6b1 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Die SD-kaart is besig. Om aflaaisels toe te laat, raak \"Skakel USB-berging af\" in die kennisgewing."</string>
<string name="cannot_download" msgid="8150552478556798780">"Kan net URL\'e met \"http\" of \"https\" aflaai."</string>
<string name="download_pending" msgid="2599683668575349559">"Begin aflaai…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Deursoek die web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Blaaier se bergingsruimte is vol"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Raak om ruimte te maak."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 023a12e..aaff539 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"የ SD ካርዱ ስራ ላይ ነው። ማውረድ ለመፍቀድ፣ በማሳወቂያ ውስጥ \"የUSB ማከማቻ አጥፋ።"</string>
<string name="cannot_download" msgid="8150552478556798780">" \"http\" ወይም \"https\" URL ብቻ ማውረድ ይችላል።"</string>
<string name="download_pending" msgid="2599683668575349559">"አውርድ በማስጀመር ላይ..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"ድሩን ፈልግ"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"የአሳሽ ማከማቻ ሙሉ ነው"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"ቦታ ነፃ ለማድረግ ነካ አድርግ።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c4992e6..5b7e846 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"بطاقة SD مشغولة. للسماح بالتنزيلات، المس \"إيقاف تشغيل وحدة تخزين USB\" في الإشعار."</string>
<string name="cannot_download" msgid="8150552478556798780">"يمكن تنزيل عناوين URL لـ \"http\" أو \"https\" فقط."</string>
<string name="download_pending" msgid="2599683668575349559">"جارٍ بدء التنزيل..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"البحث في الويب"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"سعة تخزين المتصفح ممتلئة"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"المس لتحرير مساحة."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3f3812d..939d7c8 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD картата е заета. За да разрешите изтегляния, докоснете „Изключване на USB хранилището“ в известието."</string>
<string name="cannot_download" msgid="8150552478556798780">"Могат да се изтеглят само URL адреси от тип „http“ или „https“."</string>
<string name="download_pending" msgid="2599683668575349559">"Изтеглянето се стартира…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Търсене в мрежата"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Хранилището на браузъра е пълно"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Докоснете, за да освободите място."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c78b411..7e1d826 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"La targeta SD està ocupada. Per permetre les baixades, toca Desactiva l\'emmagatzematge d\'USB a la notificació."</string>
<string name="cannot_download" msgid="8150552478556798780">"Només pot baixar URL \"http\" o \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"S\'està iniciant la baixada…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Cerca al web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"La memòria del navegador és plena"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Toca per alliberar espai."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 33306c0..162fafa 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Karta SD je zaneprázdněna. Chcete-li povolit stahování, dotkněte se v oznámení možnosti Vypnout úložiště USB."</string>
<string name="cannot_download" msgid="8150552478556798780">"Lze stahovat pouze adresy URL začínající jako http nebo https."</string>
<string name="download_pending" msgid="2599683668575349559">"Zahájení stahování..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Vyhledat na webu"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Zrušit přístup k poloze"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Dotykem uvolníte místo."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a790f42..8726c3a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-kortet er optaget. Vælg \"Slå USB-lagring fra\" i meddelelsen for at tillade downloads."</string>
<string name="cannot_download" msgid="8150552478556798780">"Kan kun downloade webadresser, der starter med \"http\" eller https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Starter download ..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Søg på nettet"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Browserlageret er fuldt"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Tryk for at frigøre plads."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 84e8bb9..d4a6288 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Die SD-Karte ist ausgelastet. Tippen Sie in der Benachrichtigung auf \"USB-Speicher deaktivieren\", um Downloads zuzulassen."</string>
<string name="cannot_download" msgid="8150552478556798780">"Nur Download von URLs mit \"http\" oder \"https\" möglich"</string>
<string name="download_pending" msgid="2599683668575349559">"Download wird gestartet…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Im Web suchen"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Browserspeicher voll"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Zur Freigabe von Speicherplatz berühren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f37b50a..3e2d2c8 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Η κάρτα SD είναι απασχολημένη. Για να επιτρέψετε τις λήψεις, αγγίξτε την επιλογή \"Απενεργοποίηση χώρου αποθήκευσης USB\" στην ειδοποίηση."</string>
<string name="cannot_download" msgid="8150552478556798780">"Είναι δυνατή η λήψη μόνο διευθύνσεων URL \"http\" ή \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Έναρξη λήψης..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Αναζήτηση στον ιστό"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Χώρος αποθήκευσης προγράμματος περιήγησης πλήρης"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Αγγίξτε για να αποδεσμεύσετε χώρο."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 656f565..be01107 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"The SD card is busy. To allow downloads, select \"Turn off USB storage\" in the notification."</string>
<string name="cannot_download" msgid="8150552478556798780">"Can only download \"http\" or \"https\" URLs."</string>
<string name="download_pending" msgid="2599683668575349559">"Starting download…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Search the web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Browser storage full"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Touch to free up space."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fd265df..bc1cf78 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"La tarjeta SD está ocupada. Para permitir descargas, selecciona \"Desactivar almacenamiento USB\" en la notificación."</string>
<string name="cannot_download" msgid="8150552478556798780">"Solo se pueden descargar URL de \"http\" o de \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Iniciando descarga..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Buscar en Internet"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Almacenamiento del navegador lleno"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Toca para liberar espacio."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 212c9f8..e887444 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"La tarjeta SD está ocupada. Para permitir las descargas, toca Desactivar almacenamiento USB en la notificación."</string>
<string name="cannot_download" msgid="8150552478556798780">"Solo se pueden descargar URL del tipo \"http\" o \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Iniciando descarga…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Buscar en la Web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Espacio de almacenamiento del navegador agotado"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Toca para liberar espacio."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index cc7872a..67138ae 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"کارت SD مشغول است. برای انجام دانلودها، خاموش کردن حافظه USB را در اعلان لمس کنید."</string>
<string name="cannot_download" msgid="8150552478556798780">"فقط می تواند URL های \"http\" یا \"https\" را دانلود کند."</string>
<string name="download_pending" msgid="2599683668575349559">"شروع دانلود..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"جستجوی وب"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"حافظه مرورگر پر است"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"برای آزاد کردن فضا لمس کنید."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 18de577..b3bce94 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-kortti on varattu. Voit sallia lataukset valitsemalla ilmoituksessa Poista USB-tallennustila käytöstä."</string>
<string name="cannot_download" msgid="8150552478556798780">"Vain http- tai https-URL-osoitteista voi ladata"</string>
<string name="download_pending" msgid="2599683668575349559">"Aloitetaan latausta…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Verkkohaku"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Selaimen tallennustila täynnä"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Vapauta tilaa koskettamalla."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6b6717d..88834ec 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"La carte SD n\'est pas disponible. Pour autoriser les téléchargements, appuyez sur \"Désactiver la mémoire de stockage USB\" dans la notification."</string>
<string name="cannot_download" msgid="8150552478556798780">"Vous ne pouvez télécharger que des URL de type \"http\" et \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Début du téléchargement..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Rechercher sur le Web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Espace de stockage du navigateur saturé"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Appuyez pour libérer de l\'espace."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index dee1134..d463e50 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD कार्ड व्यस्त है. डाउनलोड की अनुमति देने के लिए, सूचना में USB संग्रहण बंद करें स्पर्श करें."</string>
<string name="cannot_download" msgid="8150552478556798780">"केवल \"http\" या \"https\" URL डाउनलोड कर सकता है."</string>
<string name="download_pending" msgid="2599683668575349559">"डाउनलोड प्रारंभ कर रहा है…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"वेब पर खोजें"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"ब्राउज़र संग्रहण भर गया है"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"स्थान खाली करने के लिए स्पर्श करें."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 43ae340..c57136c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD kartica je zauzeta. Kako biste omogućili preuzimanja, dodirnite \"Isključi USB pohranu\" u obavijesti."</string>
<string name="cannot_download" msgid="8150552478556798780">"Mogu se preuzeti samo \"http\" ili \"https\" URL-ovi."</string>
<string name="download_pending" msgid="2599683668575349559">"Početak preuzimanja…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Pretraži web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Pohrana preglednika puna"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Dodirnite za oslobađanje prostora."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8289439..b154522 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Az SD-kártya dolgozik. A letöltések engedélyezéséhez válassza az \"USB-tár kikapcsolása\" lehetőséget."</string>
<string name="cannot_download" msgid="8150552478556798780">"Csak \"http\" vagy \"https\" URL-ek letöltése lehetséges."</string>
<string name="download_pending" msgid="2599683668575349559">"Letöltés megkezdése..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Keresés az interneten"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"A böngésző tárterülete megtelt"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Érintse meg terület felszabadításához."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2bad8d3..d8602b1 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Kartu SD sibuk. Untuk mengizinkan unduhan, sentuh Matikan penyimpanan USB pada pemberitahuan."</string>
<string name="cannot_download" msgid="8150552478556798780">"Hanya dapat mengunduh URL \"http\" atau \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Memulai unduhan..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Telusuri web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Penyimpanan peramban penuh"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Sentuh untuk mengosongkan ruang."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3abe99a..27232c2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"La scheda SD è già in uso. Per consentire i download, tocca Disattiva archivio USB nella notifica."</string>
<string name="cannot_download" msgid="8150552478556798780">"È possibile scaricare soltanto URL \"http\" o \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Avvio download..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Cerca nel Web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Memoria del browser piena"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Tocca per liberare spazio."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5be80c1..d44fb3c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"כרטיס ה-SD אינו פנוי. כדי לאפשר הורדות, גע ב\"כבה אמצעי אחסון מסוג USB\" בהתראה."</string>
<string name="cannot_download" msgid="8150552478556798780">"ניתן להוריד רק כתובות אתר המתחילות ב-\"http\" או \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"מתחיל בהורדה..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"חפש באינטרנט"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"אחסון הדפדפן מלא"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"גע כדי לפנות שטח."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 111784d..4d214ac 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SDカードは使用中です。[USBストレージをOFFにする]をタップしてからダウンロードしてください。"</string>
<string name="cannot_download" msgid="8150552478556798780">"ダウンロードできるのは「http」または「https」のURLのみです。"</string>
<string name="download_pending" msgid="2599683668575349559">"ダウンロードを開始します..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"ウェブを検索します"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"ブラウザのメモリがいっぱいです"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"タップして空き領域を増やします。"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3d4ab49..88da18e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD 카드가 사용 중입니다. 다운로드를 허용하려면 알림에서 \'USB 저장소 끄기\'를 터치하세요."</string>
<string name="cannot_download" msgid="8150552478556798780">"\'http\' 또는 \'https\' URL만 다운로드할 수 있습니다."</string>
<string name="download_pending" msgid="2599683668575349559">"다운로드 시작 중..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"웹 검색"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"브라우저 저장용량 가득 참"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"여유 공간을 확보하려면 터치하세요."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 338f1b7..dca8aef 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD kortelė užimta. Jei norite leisti atsisiuntimus, pranešime palieskite „Išjungti USB atmintinę“."</string>
<string name="cannot_download" msgid="8150552478556798780">"Galima atsisiųsti tik „http“ ar „https“ prasidedančius URL."</string>
<string name="download_pending" msgid="2599683668575349559">"Pradedamas atsisiuntimas..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Ieškoti žiniatinklyje"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Naršyklės saugykla pilna"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Palieskite, jei norite atlaisvinti vietos."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 825fb3b..160ced9 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD karte ir aizņemta. Lai atļautu lejupielādes, paziņojumā pieskarieties iespējai Izslēgt USB atmiņu."</string>
<string name="cannot_download" msgid="8150552478556798780">"Var lejupielādēt tikai tādus vietrāžus URL, kuri sākas ar “http” vai “https”."</string>
<string name="download_pending" msgid="2599683668575349559">"Notiek lejupielādes sākšana..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Meklēšana tīmeklī"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Pārlūkprogrammas krātuve ir pilna."</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Pieskarieties, lai atbrīvotu vietu."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 38e5921..ce821f4 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Kad SD sibuk. Untuk membenarkan muat turun, sentuh \"Matikan Storan USB\" dalam pemberitahuan."</string>
<string name="cannot_download" msgid="8150552478556798780">"Boleh memuat turun URL \"http\" atau \"https\" sahaja."</string>
<string name="download_pending" msgid="2599683668575349559">"Memulakan muat turun ..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Cari di web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Storan penyemak imbas penuh"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Sentuh untuk mengosongkan ruang."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 20a0854..aa645df 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-kortet er opptatt. Velg alternativet for å slå av USB-lagring i varslingen for å tillate nedlastinger."</string>
<string name="cannot_download" msgid="8150552478556798780">"Kan kun laste ned «http»- eller «https»-nettadresser."</string>
<string name="download_pending" msgid="2599683668575349559">"Starter nedlasting…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Søk på nettet"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Nettleserlageret er fullt"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Berør for å frigjøre plass."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6528999..21412f2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"De SD-kaart is in gebruik. Als u downloads wilt toestaan, raakt u \'USB-opslag uitschakelen\' in de melding aan."</string>
<string name="cannot_download" msgid="8150552478556798780">"Kan alleen URL\'s met \'http\' of \'https\' downloaden."</string>
<string name="download_pending" msgid="2599683668575349559">"Downloaden starten..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Zoeken op internet"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Browseropslag is vol"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Tik om ruimte vrij te maken."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index cda7a11..48411c0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Karta SD jest zajęta. Aby umożliwić pobieranie, w powiadomieniu dotknij Wyłącz nośnik USB."</string>
<string name="cannot_download" msgid="8150552478556798780">"Pobieranie jest możliwe tylko z adresów „http” lub „https”."</string>
<string name="download_pending" msgid="2599683668575349559">"Rozpoczynanie pobierania"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Szukaj w internecie"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Pamięć przeglądarki jest pełna"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Dotknij, aby zwolnić miejsce."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index fd1bc6e..00d7e3b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"O cartão SD está ocupado. Para permitir as transferências, selecione “Desativar unidade de armazenamento USB” na notificação."</string>
<string name="cannot_download" msgid="8150552478556798780">"Apenas é possível transferir URLs \"http\" ou \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"A iniciar a transferência..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Pesquisar na Web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Espaço de armazenamento do browser cheio"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Toque para libertar espaço."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6348bd9..e9f8265 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"O cartão SD está ocupado. Para permitir downloads, toque em Desativar armazenamento USB na notificação."</string>
<string name="cannot_download" msgid="8150552478556798780">"Somente é possível fazer download de URLs \"http\" ou \"https\""</string>
<string name="download_pending" msgid="2599683668575349559">"Iniciando download…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Pesquisar na web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Armazenamento do navegador cheio"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Toque para liberar espaço."</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 8baf04e..290b4ec 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -404,6 +404,8 @@
<!-- no translation found for cannot_download (8150552478556798780) -->
<skip />
<string name="download_pending" msgid="2599683668575349559">"Cumenzar la telechargiada…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Tschertgar en il web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Memoria dal navigatur plaina"</string>
<!-- outdated translation 7341075135051829692 --> <string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Cliccai qua per gudagnar capacitad da memorisar."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 32bca42..dc1063a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Cardul SD este ocupat. Pentru a permite descărcări, atingeţi în notificare opţiunea „Dezactivaţi stocarea USB”."</string>
<string name="cannot_download" msgid="8150552478556798780">"Puteţi descărca numai de la adrese URL care încep cu „http” sau „https”."</string>
<string name="download_pending" msgid="2599683668575349559">"Se începe descărcarea..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Căutaţi pe web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Spaţiul de stocare pentru browser este insuficient"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Atingeţi pentru a elibera spaţiu."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e2f84d3..8e47fc8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-карта занята. Чтобы разрешить загрузки, выберите \"Отключить USB-накопитель\" в уведомлении."</string>
<string name="cannot_download" msgid="8150552478556798780">"Загрузка возможна только с URL, начинающихся с \"http\" или \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Начинается загрузка…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Поиск в Интернете"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Память браузера переполнена"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Нажмите, чтобы освободить место."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 80fcf95..272f969 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Karta SD je zaneprázdnená. Ak chcete povoliť preberanie, dotknite sa v upozornení možnosti Vypnúť ukladací priestor USB."</string>
<string name="cannot_download" msgid="8150552478556798780">"Môžete prevziať len adresy URL začínajúce na „http“ alebo „https“."</string>
<string name="download_pending" msgid="2599683668575349559">"Prebieha spustenie preberania..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Hľadať na webe"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Pamäť prehliadača je plná"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Dotykom uvoľníte miesto."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c512488..a0a8b13 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Kartica SD je zasedena. Če želite omogočiti prenose datotek, se v obvestilu dotaknite možnosti »Izklopi pomnilnik USB«."</string>
<string name="cannot_download" msgid="8150552478556798780">"Prenesti je možno le URL-je »http« ali »https«."</string>
<string name="download_pending" msgid="2599683668575349559">"Začetek prenosa ..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Iskanje v spletu"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Pomnilnik brskalnika je poln"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Dotaknite se, da sprostite prostor."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5bc8433..38aee29 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD картица је заузета. Да бисте омогућили преузимања, у оквиру обавештења додирните Искључи USB меморију."</string>
<string name="cannot_download" msgid="8150552478556798780">"Могуће је преузети само URL адресе које садрже „http“ или „https“."</string>
<string name="download_pending" msgid="2599683668575349559">"Покретање преузимања…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Претражи Веб"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Складиште прегледача је пуно"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Додирните да бисте ослободили простор."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 48874a0..9fd8e8c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-kortet är upptaget. Om du vill tillåta hämtning väljer du Inaktivera USB-lagring i meddelandet."</string>
<string name="cannot_download" msgid="8150552478556798780">"Det går bara att hämta webbadresser som inleds med http eller https."</string>
<string name="download_pending" msgid="2599683668575349559">"Startar hämtning…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Sök på webben"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Webbläsarens lagringsutrymme är fullt"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Tryck här om du vill frigöra utrymme."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 21cb45f..22e9fa0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Kadi ya SD inashughuli. Kuruhusu vipakuzi, gusa \"Zima Hifadhi ya USB\" katika arifa."</string>
<string name="cannot_download" msgid="8150552478556798780">"Inaweza kupakua tu URLs za \"http\" au \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Inaanza kupakua..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Tafuta wavuti"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Hifadhi ya kivinjari imejaa"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Gusaa ili kupata nafasi."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1c17b1c..cc4fe47 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"การ์ด SD ถูกใช้งานอยู่ หากต้องการอนุญาตให้ดาวน์โหลด ให้แตะ \"ปิดที่จัดเก็บข้อมูล USB\" ในการแจ้งเตือน"</string>
<string name="cannot_download" msgid="8150552478556798780">"ดาวน์โหลดได้เฉพาะ URL \"http\" หรือ \"https\""</string>
<string name="download_pending" msgid="2599683668575349559">"เริ่มต้นดาวน์โหลด…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"ค้นหาเว็บ"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"พื้นที่จัดเก็บของเบราว์เซอร์เต็ม"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"แตะเพื่อเพิ่มพื้นที่ว่าง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index dfbf947..598040a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Busy ang SD card. Upang bigyang-daan ang mga pag-download, pindutin ang I-Off ang USB Storage sa notification."</string>
<string name="cannot_download" msgid="8150552478556798780">"Maaari lang mag-download ng mga URL ng \"http\" o \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Sinisimulan ang pag-download..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Maghanap sa web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Puno na ang imbakan ng browser"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Pumindot upang magka-espasyo."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0515b5b..acaf8f0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD kart meşgul. İndirme işlemlerine izin vermek için bildirim alanında USB Depolama Birimini Kapat seçeneğine dokunun."</string>
<string name="cannot_download" msgid="8150552478556798780">"Yalnızca \"http\" veya \"https\" URL\'leri indirilebilir."</string>
<string name="download_pending" msgid="2599683668575349559">"İndirme işlemi başlatılıyor…"</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Web\'de ara"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Tarayıcı deposu dolu"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Yer boşaltmak için dokunun."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d064872..be98c3b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Карта SD зайнята. Щоб дозволити завантаження, торкніться в сповіщенні опції \"Вимкнути носій USB\"."</string>
<string name="cannot_download" msgid="8150552478556798780">"Можна завантажувати лише URL-адреси \"http\" або \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Початок завант-ня..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Пошук в Інтернеті"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Пам\'ять перегл-ча заповн."</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Торкніться, щоб звільнити місце."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 80d9558..86cfea2 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Thẻ SD đang bận. Để cho phép tải xuống, hãy chạm vào Tắt bộ nhớ USB trong thông báo."</string>
<string name="cannot_download" msgid="8150552478556798780">"Chỉ có thể tải xuống URL \"http\" hoặc \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Đang bắt đầu tải xuống..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Tìm kiếm trên web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Bộ nhớ của trình duyệt đầy"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Chạm để giải phóng dung lượng."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 604431d..2f296da 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD 卡正忙。要允许下载，请在通知中触摸“关闭 USB 存储设备”。"</string>
<string name="cannot_download" msgid="8150552478556798780">"只能从“http”或“https”网址下载。"</string>
<string name="download_pending" msgid="2599683668575349559">"正在开始下载..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"搜索网页"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"浏览器存储空间已满"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"触摸可释放空间。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 02eefbb..b841947 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD 卡忙碌中。如要允許下載，請輕觸通知中的 [關閉 USB 儲存裝置]。"</string>
<string name="cannot_download" msgid="8150552478556798780">"僅可下載「http」或「https」網址的檔案。"</string>
<string name="download_pending" msgid="2599683668575349559">"正在開始下載..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"搜尋網頁"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"瀏覽器儲存空間已滿"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"輕觸即可釋放儲存空間。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 796c2c4..31bff95 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -313,6 +313,8 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Ikhadi le-SD limatasa. Ukuvumela ukulanda, khetha \"Vala ukulondoloza nge-USB\" kwisaziso."</string>
<string name="cannot_download" msgid="8150552478556798780">"Ingalayisha kuphela ama-URL e-\"http\" noma ama-\"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Iqalisa ukulayisha..."</string>
+ <!-- no translation found for help_page (2906208423557552540) -->
+ <skip />
<string name="search_the_web" msgid="6046130189241962337">"Sesha iwebhu"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Ukulondoloza isiphequluli kugcwele"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Thinta ukuvula iskhala."</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 361702e..3c87e22 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -80,4 +80,17 @@
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textStyle">normal</item>
</style>
+
+ <style name="AutofillProfileTextView">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:gravity">center_vertical</item>
+ <item name="android:layout_margin">2dip</item>
+ <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+ </style>
+ <style name="AutofillProfileEditText" parent="@style/AutofillProfileTextView">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:imeOptions">flagNoExtractUi</item>
+ <item name="android:singleLine">true</item>
+ </style>
</resources>
diff --git a/src/com/android/browser/AutoFillSettingsFragment.java b/src/com/android/browser/AutoFillSettingsFragment.java
index 04f45b5..7be657d 100644
--- a/src/com/android/browser/AutoFillSettingsFragment.java
+++ b/src/com/android/browser/AutoFillSettingsFragment.java
@@ -52,7 +52,9 @@
private EditText mCountryEdit;
private EditText mPhoneEdit;
- private Button mSaveButton;
+ private MenuItem mSaveMenuItem;
+
+ private boolean mInitialised;
// Used to display toast after DB interactions complete.
private Handler mHandler;
@@ -87,7 +89,7 @@
mPhoneEdit.setError(null);
}
- updateButtonState();
+ updateSaveMenuItemState();
}
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -99,7 +101,7 @@
private class FieldChangedListener implements TextWatcher {
public void afterTextChanged(Editable s) {
- updateButtonState();
+ updateSaveMenuItemState();
}
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -147,11 +149,14 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.autofill_profile_editor, menu);
+ mSaveMenuItem = menu.findItem(R.id.autofill_profile_editor_save_profile_menu_id);
+ updateSaveMenuItemState();
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- if (item.getItemId() == R.id.autofill_profile_editor_delete_profile_menu_id) {
+ switch (item.getItemId()) {
+ case R.id.autofill_profile_editor_delete_profile_menu_id:
// Clear the UI.
mFullNameEdit.setText("");
mEmailEdit.setText("");
@@ -168,10 +173,30 @@
// trigger the current profile to get deleted from the DB.
mSettings.setAutoFillProfile(null,
mHandler.obtainMessage(PROFILE_DELETED_MSG));
- updateButtonState();
+ updateSaveMenuItemState();
return true;
+
+ case R.id.autofill_profile_editor_save_profile_menu_id:
+ AutoFillProfile newProfile = new AutoFillProfile(
+ mUniqueId,
+ mFullNameEdit.getText().toString(),
+ mEmailEdit.getText().toString(),
+ mCompanyEdit.getText().toString(),
+ mAddressLine1Edit.getText().toString(),
+ mAddressLine2Edit.getText().toString(),
+ mCityEdit.getText().toString(),
+ mStateEdit.getText().toString(),
+ mZipEdit.getText().toString(),
+ mCountryEdit.getText().toString(),
+ mPhoneEdit.getText().toString());
+
+ mSettings.setAutoFillProfile(newProfile,
+ mHandler.obtainMessage(PROFILE_SAVED_MSG));
+ return true;
+
+ default:
+ return false;
}
- return false;
}
@Override
@@ -203,27 +228,6 @@
mCountryEdit.addTextChangedListener(mFieldChangedListener);
mPhoneEdit.addTextChangedListener(new PhoneNumberValidator());
- mSaveButton = (Button)v.findViewById(R.id.autofill_profile_editor_save_button);
- mSaveButton.setOnClickListener(new OnClickListener() {
- public void onClick(View button) {
- AutoFillProfile newProfile = new AutoFillProfile(
- mUniqueId,
- mFullNameEdit.getText().toString(),
- mEmailEdit.getText().toString(),
- mCompanyEdit.getText().toString(),
- mAddressLine1Edit.getText().toString(),
- mAddressLine2Edit.getText().toString(),
- mCityEdit.getText().toString(),
- mStateEdit.getText().toString(),
- mZipEdit.getText().toString(),
- mCountryEdit.getText().toString(),
- mPhoneEdit.getText().toString());
-
- mSettings.setAutoFillProfile(newProfile,
- mHandler.obtainMessage(PROFILE_SAVED_MSG));
- }
- });
-
// Populate the text boxes with any pre existing AutoFill data.
AutoFillProfile activeProfile = mSettings.getAutoFillProfile();
if (activeProfile != null) {
@@ -239,14 +243,25 @@
mPhoneEdit.setText(activeProfile.getPhoneNumber());
}
- updateButtonState();
+ mInitialised = true;
+
+ updateSaveMenuItemState();
return v;
}
- public void updateButtonState() {
+ private void updateSaveMenuItemState() {
+ if (mSaveMenuItem == null) {
+ return;
+ }
- boolean valid = (mFullNameEdit.getText().toString().length() > 0 ||
+ if (!mInitialised) {
+ mSaveMenuItem.setEnabled(false);
+ return;
+ }
+
+ boolean currentState = mSaveMenuItem.isEnabled();
+ boolean newState = (mFullNameEdit.getText().toString().length() > 0 ||
mEmailEdit.getText().toString().length() > 0 ||
mCompanyEdit.getText().toString().length() > 0 ||
mAddressLine1Edit.getText().toString().length() > 0 ||
@@ -257,9 +272,9 @@
mCountryEdit.getText().toString().length() > 0) &&
mPhoneEdit.getError() == null;
- // Only enable the save buttons if we have at least one field completed
- // and the phone number (if present is valid).
- mSaveButton.setEnabled(valid);
+ if (currentState != newState) {
+ mSaveMenuItem.setEnabled(newState);
+ }
}
private void closeEditor() {
diff --git a/src/com/android/browser/AutofillHandler.java b/src/com/android/browser/AutofillHandler.java
index c4b14d7..dc23d00 100644
--- a/src/com/android/browser/AutofillHandler.java
+++ b/src/com/android/browser/AutofillHandler.java
@@ -21,9 +21,11 @@
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.database.Cursor;
+import android.net.Uri;
import android.os.AsyncTask;
import android.os.Message;
import android.preference.PreferenceManager;
+import android.provider.ContactsContract;
import android.webkit.WebSettings.AutoFillProfile;
import java.util.concurrent.CountDownLatch;
@@ -114,8 +116,58 @@
c.close();
autoFillDb.close();
+ if (mAutoFillProfile == null) {
+ // We did not load a profile from disk. Try to populate one with the user's
+ // "me" contact.
+ final Uri profileUri = Uri.withAppendedPath(ContactsContract.Profile.CONTENT_URI,
+ ContactsContract.Contacts.Data.CONTENT_DIRECTORY);
+
+ String name = getContactField(profileUri,
+ ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME,
+ ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE);
+ // Only attempt to read other data and set a profile if we could successfully
+ // get a name.
+ if (name != null) {
+ String email = getContactField(profileUri,
+ ContactsContract.CommonDataKinds.Email.ADDRESS,
+ ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE);
+ String phone = getContactField(profileUri,
+ ContactsContract.CommonDataKinds.Phone.NUMBER,
+ ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
+ String company = getContactField(profileUri,
+ ContactsContract.CommonDataKinds.Organization.COMPANY,
+ ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE);
+
+ // Can't easily get structured postal address information (even using
+ // CommonDataKinds.StructuredPostal) so omit prepopulating that for now.
+ // When querying structured postal data, it often all comes back as a string
+ // inside the "street" field.
+
+ mAutoFillProfile = new AutoFillProfile(
+ 1, name, email, company, null, null, null, null,
+ null, null, phone);
+ }
+ }
+
mLoaded.countDown();
}
+
+ private String getContactField(Uri uri, String field, String itemType) {
+ String result = null;
+
+ Cursor c = mContext.getContentResolver().query(uri, new String[] { field },
+ ContactsContract.Data.MIMETYPE + "=?", new String[] { itemType }, null);
+
+ try {
+ // Just use the first returned value if we get more than one.
+ if (c.moveToFirst()) {
+ result = c.getString(0);
+ }
+ } finally {
+ c.close();
+ }
+ return result;
+ }
}
public void setAutoFillProfile(AutoFillProfile profile, Message msg) {