Merge "Updated Browser mipmap launcher icon" into honeycomb
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index f8eb03b..526e44c 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -76,7 +76,6 @@
android:layout_width="0dip"
android:layout_weight="1.0"
android:layout_height="match_parent"
- android:layout_marginTop="12dip"
android:layout_marginLeft="16dip"
android:paddingLeft="0dip"
android:paddingRight="0dip"
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2bc9488..28eb7cf 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"الإشارات"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"ليس هناك أي إشارات"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"اختيار الحساب"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"المزامنة مع حساب Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"لم يتم إقران إشارات Android مع حساب Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"إزالة إشارات Android"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 70c2655..adf2241 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Отметки"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Няма отметки"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Изберете профил"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Синхронизиране с профил в Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Отметките ви в Android не са свързани с профил в Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Премахване на отметките ви в Android"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0deee42..0fd3816 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Marcadors"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"No hi ha marcadors"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Elecció d\'un compte"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronitza amb el Compte de Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Els teus marcadors d\'Android no estan associades amb un Compte de Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Elimina els teus marcadors d\'Android"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6a09a95..f3259be 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Záložky"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Žádné záložky k zobrazení"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Zvolit účet"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synchronizovat s účtem Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Vaše záložky v systému Android nejsou přidruženy k účtu Google."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Odebrat záložky systému Android"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index bebf2a1..388194e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bogmærker"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Der er ingen bogmærker"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Vælg konto"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synkroniser med Google-konto"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Dine Android-bogmærker er ikke tilknyttet en Google-konto"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Fjern dine Android-bogmærker"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c976c3f..cfcb512 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Lesezeichen"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Es sind keine Lesezeichen vorhanden."</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Konto wählen"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Mit Google-Konto synchronisieren"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Ihre Android-Lesezeichen sind mit keinem Google-Konto verknüpft."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Android-Lesezeichen entfernen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f88bfd9..ed46098 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Σελιδοδείκτες"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Δεν υπάρχουν σελιδοδείκτες"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Επιλέξτε λογαριασμό"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Συγχρον. με Λογαριασμό Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Οι σελιδοδείκτες σας Android δεν σχετίζονται με κάποιον Λογαριασμό Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Καταργήστε τους σελιδοδείκτες σας Android"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index bcd88e9..e6abbb5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bookmarks"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"There are no bookmarks"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Choose Account"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sync with Google account"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Your Android bookmarks are not associated with a Google account"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Remove your Android bookmarks"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d126ecb..b8eda3d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -365,6 +365,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Marcadores"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"No hay ningún marcador"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Seleccionar la cuenta"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronización con cta de Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Tus favoritos de Android no están asociados con una cuenta de Google."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Eliminar tus favoritos de Android"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9dd648f..543e02e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Marcadores"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"No hay ningún marcador."</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Elegir cuenta"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizar con cuenta de Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Tus marcadores de Android no se han asociado a una cuenta de Google."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Eliminar los marcadores de Android"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0ebc286..3f56b4b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"نشانک ها"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"نشانکی وجود ندارد"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"انتخاب حساب"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"همگام سازی با حساب Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"نشانک های Android شما با حساب Google مرتبط نیستند"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"حذف نشانک های Android خود"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4e2fba8..9767321 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Kirjanmerkit"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Ei kirjanmerkkejä"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Valitse tili"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synkronoi Google-tilin kanssa"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Android-kirjanmerkkejä ei ole yhdistetty Google-tiliin"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Poista Android-kirjanmerkkisi"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c06333d..da9de24 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Favoris"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Aucun favori"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Choisir un compte"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synchronisation avec un compte Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Vos favoris Android ne sont associés à aucun compte Google."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Supprimer vos favoris Android"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9ece87e..10b5924 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Oznake"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nema oznaka"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Odaberite Račun"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sinkronizacija s Google Računom"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Vaše Android oznake nisu povezane s Google Računom"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Izbrišite oznake programa Android"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c33b306..aca9dc4 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Könyvjelzők"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nincsenek könyvjelzők"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Fiók kiválasztása"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Szinkronizálás Google Fiókkal"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Androidos könyvjelzői nincsenek Google Fiókhoz társítva"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Az Androidos könyvjelzők törlése"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bc550ed..3913128 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bookmark"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Tidak ada bookmark"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Pilih Akun"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sinkronkan dengan akun Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Bookmark Android Anda tidak terkait dengan akun Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Hapus bookmark Android Anda"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b679997..6373249 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Segnalibri"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nessun segnalibro disponibile"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Scegli account"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizza con l\'account Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"I tuoi Segnalibri Android non sono associati a un account Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Rimuovi i tuoi Segnalibri Android"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8d1a709..eb2a7c5 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -277,7 +277,7 @@
<item msgid="2193955365569270096">"קוריאנית (EUC-KR)"</item>
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"קידוד טקסט"</string>
- <string name="pref_lab_title" msgid="5571091610359629423">"מעבדות"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"פקדים מהירים"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"החלק את האגודל מהקצה הימני או השמאלי כדי לגשת לפקדים המהירים"</string>
<string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"דף הבית הפופולרי ביותר"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"סימניות"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"אין סימניות"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"בחר חשבון"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"סנכרן עם חשבון Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"סימניות Android שלך אינן משויכות לחשבון Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"הסר את הסימניות של Android"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 875f4c3..db2d9e5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"ブックマーク"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"ブックマークはありません"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"アカウントの選択"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Googleアカウントと同期"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"AndroidのブックマークはGoogleアカウントに関連付けられていません"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Androidのブックマークを削除"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8ef2a8b..3d66b0b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"북마크"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"북마크가 없습니다."</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"계정 선택"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Google 계정과 동기화"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"사용자의 Android 북마크는 Google 계정과 연결되지 않았습니다."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Android 북마크 삭제"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0e22473..e776b55 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Žymės"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nėra žymių"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Pasirinkite paskyrą"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sinchron. su „Google“ paskyra"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"„Android“ žymės nėra susietos su „Google“ paskyra"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Pašalinti „Android“ žymes"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5b24fd9..459bcb3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Grāmatzīmes"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nav nevienas grāmatzīmes."</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Izvēlieties kontu."</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sinhronizācija ar Google kontu"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Jūsu Android grāmatzīmes nav saistītas ar jūsu Google kontu."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Noņemt Android grāmatzīmes"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1c23b96..23480a3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bokmerker"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Det er ingen bokmerker"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Velg konto"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synkroniser med Google-konto"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Dine Android-bokmerker er ikke tilknyttet en Google-konto"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Fjern Android-bokmerkene"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f961258..ea00997 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bladwijzers"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Er zijn geen bladwijzers"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"J1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Account kiezen"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synchroniseren met Google-account"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Uw Android-bladwijzers zijn niet gekoppeld aan een Google-account"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Uw Android-bladwijzers verwijderen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4db4aea..83d5827 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Zakładki"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Brak zakładek"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Wybierz konto"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synchronizuj z kontem Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Zakładki w systemie Android nie są powiązane z kontem Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Usuń zakładki w systemie Android"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 74c1041..07c40c0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Marcadores"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Não existem marcadores"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Escolher conta"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizar com conta Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Os seus marcadores do Android não estão associados a uma conta Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Remover marcadores do Android"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5039812..036bd51 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Favoritos"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Não há nenhum favorito"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Escolha conta"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizar com Conta do Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Seus favoritos do Android não estão associados a uma Conta do Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Remover os favoritos do Android"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index b9a32e9..777e778 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -436,6 +436,9 @@
<!-- no translation found for empty_bookmarks_folder (7843361614634930942) -->
<skip />
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <!-- no translation found for account_chooser_dialog_title (3314204833188808194) -->
+ <!-- no translation found for account_chooser_dialog_title (4833571985009544332) -->
+ <skip />
<!-- no translation found for import_bookmarks_dialog_title (3325557652271172128) -->
<skip />
<!-- no translation found for import_bookmarks_dialog_description (2187665745413495303) -->
diff --git a/res/values-ro-xlarge/strings.xml b/res/values-ro-xlarge/strings.xml
index d8e407d..2e13633 100644
--- a/res/values-ro-xlarge/strings.xml
+++ b/res/values-ro-xlarge/strings.xml
@@ -22,7 +22,7 @@
<string name="contextmenu_openlink_newwindow" msgid="1061831678814826192">"Deschideţi în filă nouă"</string>
<!-- no translation found for contextmenu_openlink_newwindow_background (5625314148071601758) -->
<skip />
- <string name="open_all_in_new_window" msgid="8498279523071618315">"Deschideţi toate în file noi"</string>
+ <string name="open_all_in_new_window" msgid="8498279523071618315">"Deschideţi-le pe toate în file noi"</string>
<!-- no translation found for pref_content_open_in_background_summary (7653600574808720292) -->
<skip />
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b45487c..741d11e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -99,7 +99,7 @@
<string name="current_page" msgid="7510129573681663135">"din "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Marcajul „<xliff:g id="BOOKMARK">%s</xliff:g>” va fi şters."</string>
<string name="open_in_new_window" msgid="6596775546468054510">"Deschideţi într-o fereastră nouă"</string>
- <string name="open_all_in_new_window" msgid="6514602245828366045">"Deschideţi toate în ferestre noi"</string>
+ <string name="open_all_in_new_window" msgid="6514602245828366045">"Deschideţi-le pe toate în ferestre noi"</string>
<string name="goto_dot" msgid="3895839050522602723">"Accesaţi"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Deschideţi filă incognito nouă"</string>
<string name="select_dot" msgid="6299170761900561967">"Selectaţi text"</string>
@@ -281,8 +281,8 @@
<string name="pref_lab_title" msgid="5571091610359629423">"Laborator"</string>
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"Comenzi rapide"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Glisaţi degetul dinspre marg. din st. sau din dr. pt. a accesa comenzile rapide"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Cea mai accesată Pagină de pornire"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Setează pagina dvs. de pornire pentru a afişa cele mai accesate pagini."</string>
+ <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Pagina de pornire Cele mai vizitate"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Vă setează pagina de pornire pentru a afişa cele mai vizitate pagini."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Există o problemă de conexiune la date"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problemă cu fişierul"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirmaţi"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Marcaje"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nu există marcaje"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Alegeţi contul"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizaţi cu un Cont Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Marcajele dvs. Android nu sunt asociate unui Cont Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Eliminaţi marcajele Android"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ac52087..5eca519 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Закладки"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Нет закладок"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Выберите аккаунт"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Синхронизация с аккаунтом Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Закладки Android не связаны с аккаунтом Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Удалить закладки Android"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8a687db..f7d3a11 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Záložky"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Žiadne záložky na zobrazenie"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Vyberte účet"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synchronizovať s účtom Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Vaše záložky v systéme Android nie sú priradené k účtu Google."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Odstrániť záložky systému Android"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 25e56d9..cbbb9b8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Zaznamki"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Ni zaznamkov"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Izberite račun"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sinhroniziraj z Google Računom"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Vaši Androidovi zaznamki niso povezani z Googlovim računom"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Odstranite Androidove zaznamke"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 40a6bfb..1f0f528 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Обележивачи"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Нема обележивача"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Избор налога"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Синхронизуј са Google налогом"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Android обележивачи нису повезани са Google налогом"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Уклоните Android обележиваче"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 516b81f..e57dd8c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bokmärken"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Det finns inga bokmärken"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Välj konto"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synkronisera med Google-konto"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Dina Android-bokmärken har inte kopplats till något Google-konto"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Ta bort dina Android-bokmärken"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index bdf7ccb..8145292 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"บุ๊กมาร์ก"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"ไม่มีบุ๊กมาร์ก"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"เลือกบัญชี"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"ซิงค์กับบัญชี Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"บุ๊กมาร์ก Android ของคุณไม่เชื่อมโยงกับบัญชี Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"ลบบุ๊กมาร์ก Android ของคุณ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 9450533..3c65ac0 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Mga Bookmark"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Walang mga bookmark"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Pumili ng Account"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Mag-sync sa Google account"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Walang kaugnayan ang iyong mga Android bookmark sa isang Google account"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Alisin ang iyong mga Android bookmark"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cff40b3..c8a95ee 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Yer işaretleri"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Hiçbir yer işareti yok"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Hesap Seçin"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Google hesabı ile senkronize et"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Android yer işaretleriniz bir Google hesabı ile ilişkilendirilmemiş"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Android yer işaretlerinizi kaldırın"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7e98c18..08e87d1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -282,7 +282,7 @@
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"Елементи швидкого керування"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Проведіть пальцем від лівого/правого краю для доступу до елем. швидк. керування"</string>
<string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Дом. стор. функції \"Часто відвідувані\""</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Налаштовує домашню сторінку на відображення найчастіше відвідуваних сторінок."</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Налаштовує на домашній сторінці показ найчастіше відвідуваних сторінок."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Проблема з доступом до даних"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Проблема з файлом"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Підтверд."</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Закладки"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Немає закладок"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Вибрати обліковий запис"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Синхроніз. з обл. записом Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Ваші закладки Android не пов\'язано з обліковим записом Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Видалити закладки Android"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 46aedaf..b9bc1d6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Dấu trang"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Không có dấu trang"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Chọn tài khoản"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Đồng bộ hóa với tài khoản Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Dấu trang Android của bạn không được kết hợp với tài khoản Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Xóa dấu trang Android của bạn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2c8e4b8..9e4b87a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"书签"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"无书签"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"选择帐户"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"与 Google 帐户同步"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Android 书签尚未与 Google 帐户关联"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"删除 Android 书签"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 99cfb53..6d0a1d5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"書籤"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"沒有任何書籤"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"選擇帳戶"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"與 Google 帳戶保持同步"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"您的 Android 書籤未與任何 Google 帳戶建立關聯"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"移除您的 Android 書籤"</string>
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 2fd9d3d..0dcece6 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -133,7 +133,7 @@
mUrlInput.setOnFocusChangeListener(this);
mUrlInput.setSelectAllOnFocus(true);
mUrlInput.addTextChangedListener(this);
- setUrlMode(false);
+ setEditMode(false);
}
void updateNavigationState(Tab tab) {
@@ -187,7 +187,11 @@
if (!mEditable && hasFocus) {
mUi.editUrl(false);
} else {
- setUrlMode(hasFocus);
+ if (hasFocus) {
+ setEditMode(hasFocus);
+ } else {
+ mUrlInput.stopEditing();
+ }
}
mUrlContainer.setBackgroundDrawable(hasFocus
? mFocusDrawable : mUnfocusDrawable);
@@ -266,7 +270,7 @@
private void clearOrClose() {
if (TextUtils.isEmpty(mUrlInput.getText())) {
// close
- setUrlMode(false);
+ mUrlInput.stopEditing();
} else {
// clear
mUrlInput.setText("");
@@ -307,15 +311,16 @@
@Override
public void onDismiss() {
- Tab currentTab = mUi.getActiveTab();
- if (currentTab != null && currentTab.getWebView() != null) {
- currentTab.getWebView().requestFocus();
- }
+ final Tab currentTab = mUi.getActiveTab();
mUi.hideFakeTitleBar();
- // if top != null current must be set
- if ((currentTab != null) && !mInVoiceMode) {
- setDisplayTitle(currentTab.getUrl());
- }
+ post(new Runnable() {
+ public void run() {
+ TitleBarXLarge.this.clearFocus();
+ if ((currentTab != null) && !mInVoiceMode) {
+ setDisplayTitle(currentTab.getUrl());
+ }
+ }
+ });
}
/**
@@ -330,8 +335,8 @@
}
}
- void setUrlMode(boolean focused) {
- if (focused) {
+ void setEditMode(boolean edit) {
+ if (edit) {
mUrlInput.setDropDownWidth(mUrlContainer.getWidth());
mUrlInput.setDropDownHorizontalOffset(-mUrlInput.getLeft());
mSearchButton.setVisibility(View.GONE);
@@ -343,9 +348,6 @@
mWebIcon.setImageResource(R.drawable.ic_search_holo_dark);
updateSearchMode();
} else {
- if (mUrlInput.hasFocus()) {
- mUrlInput.clearFocus();
- }
mGoButton.setVisibility(View.GONE);
mVoiceSearch.setVisibility(View.GONE);
mStar.setVisibility(View.VISIBLE);
@@ -454,4 +456,5 @@
void setIncognitoMode(boolean incognito) {
mUrlInput.setIncognitoMode(incognito);
}
+
}
diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 3e49c06..23e412d 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -166,14 +166,16 @@
performFiltering(getText().toString(), 0);
showDropDown();
}
- } else {
- finishInput(null, null, null);
}
if (mWrappedFocusListener != null) {
mWrappedFocusListener.onFocusChange(v, hasFocus);
}
}
+ void stopEditing() {
+ finishInput(null, null, null);
+ }
+
public void setUrlInputListener(UrlInputListener listener) {
mListener = listener;
}
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 2aaa029..0fa38cf 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -304,7 +304,7 @@
@Override
protected void hideFakeTitleBar() {
if (isFakeTitleBarShowing()) {
- mFakeTitleBar.setUrlMode(false);
+ mFakeTitleBar.setEditMode(false);
mContentView.removeView(mFakeTitleBar);
mTabBar.onHideTitleBar();
}
@@ -417,7 +417,8 @@
return true;
}
}
- if (event.isPrintingKey() && !mFakeTitleBar.isEditingUrl()) {
+ boolean ctrl = event.hasModifiers(KeyEvent.META_CTRL_ON);
+ if (!ctrl && event.isPrintingKey() && !mFakeTitleBar.isEditingUrl()) {
editUrl(true);
return mContentView.dispatchKeyEvent(event);
}