Merge branch 'froyo' into froyo-release
diff --git a/res/drawable-hdpi/textfield_voice_search.9.png b/res/drawable-hdpi/textfield_voice_search.9.png
index d988493..5d3f281 100644
--- a/res/drawable-hdpi/textfield_voice_search.9.png
+++ b/res/drawable-hdpi/textfield_voice_search.9.png
Binary files differ
diff --git a/res/drawable-mdpi/textfield_voice_search.9.png b/res/drawable-mdpi/textfield_voice_search.9.png
index 5cf6592..e7baba0 100644
--- a/res/drawable-mdpi/textfield_voice_search.9.png
+++ b/res/drawable-mdpi/textfield_voice_search.9.png
Binary files differ
diff --git a/res/drawable/title_voice.xml b/res/drawable/title_voice.xml
index 0bb1ad3..e96eb94 100644
--- a/res/drawable/title_voice.xml
+++ b/res/drawable/title_voice.xml
@@ -16,7 +16,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@*android:drawable/textfield_pressed" />
+ android:drawable="@*android:drawable/textfield_search_empty_pressed" />
<item android:state_pressed="false"
android:drawable="@drawable/textfield_voice_search" />
</selector>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 41619df..717d44c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Stahování nelze dokončit. Není dostatek místa."</string>
<string name="download_length_required" msgid="9038605488460437406">"Nelze stáhnout. Velikost položky nelze určit."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Stahování bylo přerušeno a nelze v něm pokračovat."</string>
+ <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="7341075135051829692">"Kliknutím uvolníte místo."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Zrušit přístup k poloze"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Vymazat uložená data"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 197c0de..f911981 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Download kan ikke afsluttes. Der er ikke nok plads."</string>
<string name="download_length_required" msgid="9038605488460437406">"Der kan ikke downloades. Størrelsen på elementet kan ikke fastsættes."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Download blev afbrudt. Den kan ikke genoptages."</string>
+ <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="7341075135051829692">"Klik her for at frigøre plads."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Ryd lagrede data"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Ryd lagrede data"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c61c70a..7e6595c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Download kann nicht beendet werden, da nicht genügend Speicherplatz vorhanden ist."</string>
<string name="download_length_required" msgid="9038605488460437406">"Download kann nicht gestartet werden, da die Größe des Elements nicht bestimmt werden kann."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Download wurde unterbrochen und kann nicht fortgesetzt werden."</string>
+ <string name="search_the_web" msgid="6046130189241962337">"Web durchsuchen"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Browserspeicher voll"</string>
<string name="webstorage_outofspace_notification_text" msgid="7341075135051829692">"Klicken Sie, um Speicherplatz freizugeben."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Gespeicherte Daten löschen"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Gespeicherte Daten löschen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 098f2d8..ab5a056 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Δεν είναι δυνατή η ολοκλήρωση της λήψης. Δεν υπάρχει αρκετός διαθέσιμος χώρος."</string>
<string name="download_length_required" msgid="9038605488460437406">"Δεν είναι δυνατή η λήψη. Δεν είναι δυνατός ο προσδιορισμός του μεγέθους του στοιχείου."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Η λήψη διακόπηκε. Δεν είναι δυνατή η συνέχισή της."</string>
+ <string name="search_the_web" msgid="6046130189241962337">"Αναζήτηση στον ιστό"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Χώρος αποθήκευσης προγράμματος περιήγησης πλήρης"</string>
<string name="webstorage_outofspace_notification_text" msgid="7341075135051829692">"Κάντε κλικ για να αποδεσμεύσετε χώρο."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Εκκαθάριση αποθηκευμένων δεδομένων"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Εκκαθάριση αποθηκευμένων δεδομένων"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0f632f1..60899a9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"No es posible terminar la descarga. No hay espacio suficiente."</string>
<string name="download_length_required" msgid="9038605488460437406">"No es posible realizar la descarga. No puede determinarse el tamaño del elemento."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Descarga interrumpida. No se puede retomar."</string>
+ <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="7341075135051829692">"Hacer clic para liberar espacio"</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Borrar datos almacenados"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Borrar datos almacenados"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cd96e86..38d742f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"No se puede completar la descarga porque no hay suficiente espacio."</string>
<string name="download_length_required" msgid="9038605488460437406">"No se puede realizar la descarga porque no es posible determinar el tamaño del elemento."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"La descarga se ha interrumpido y no se puede reanudar."</string>
+ <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="7341075135051829692">"Haz clic aquí para liberar espacio."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Borrar datos almacenados"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Borrar datos almacenados"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c80db78..a56ecf9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Téléchargement interrompu. Espace insuffisant."</string>
<string name="download_length_required" msgid="9038605488460437406">"Téléchargement impossible. La taille de l\'élément n\'a pas pu être déterminée."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Téléchargement interrompu. Impossible de reprendre le téléchargement."</string>
+ <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="7341075135051829692">"Cliquez ici pour libérer de l\'espace."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Effacer les données stockées"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Effacer les données stockées"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2cd29e1..c5045cc 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Impossibile terminare il download. Spazio insufficiente."</string>
<string name="download_length_required" msgid="9038605488460437406">"Impossibile effettuare il download. Impossibile determinare le dimensioni dell\'elemento."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Download interrotto. Impossibile ripristinarlo."</string>
+ <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="7341075135051829692">"Fai clic per liberare spazio."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Cancella dati archiviati"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Cancella dati archiviati"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 18f7103..0701791 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"空き容量が不足しているため、ダウンロードを完了できません。"</string>
<string name="download_length_required" msgid="9038605488460437406">"項目のサイズを特定できないため、ダウンロードできません。"</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"ダウンロードが中断されました。再開できません。"</string>
+ <string name="search_the_web" msgid="6046130189241962337">"ウェブを検索します"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"ブラウザのメモリがいっぱいです"</string>
<string name="webstorage_outofspace_notification_text" msgid="7341075135051829692">"クリックして空き領域を増やします。"</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"保存したデータを消去"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"保存したデータを消去"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 47ab3cf..859b765 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"저장 용량이 부족하여 다운로드를 완료할 수 없습니다."</string>
<string name="download_length_required" msgid="9038605488460437406">"항목의 크기를 확인할 수 없으므로 다운로드할 수 없습니다."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"다운로드가 중단되었으며 다시 시작할 수 없습니다."</string>
+ <string name="search_the_web" msgid="6046130189241962337">"웹 검색"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"브라우저 저장용량 가득 참"</string>
<string name="webstorage_outofspace_notification_text" msgid="7341075135051829692">"여유 공간을 확보하려면 클릭하세요."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"저장된 데이터 삭제"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"저장된 데이터 삭제"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6600f0a..83f4a23 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Kan ikke fullføre nedlastingen. Det er ikke nok plass."</string>
<string name="download_length_required" msgid="9038605488460437406">"Kan ikke laste ned. Kan ikke fastsette størrelsen på filen."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Nedlasting avbrutt. Den kan ikke gjenopptas."</string>
+ <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="7341075135051829692">"Klikk for å frigjøre plass."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Fjern lagrede data"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Fjern lagrede data"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 72b6fe1..d6a6858 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Kan download niet voltooien. Er is niet genoeg ruimte."</string>
<string name="download_length_required" msgid="9038605488460437406">"Kan niet downloaden. De grootte van het item kan niet worden vastgesteld."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Download is onderbroken. Deze kan niet worden voortgezet."</string>
+ <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="7341075135051829692">"Klik hier om ruimte vrij te maken."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Opgeslagen gegevens wissen"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Opgeslagen gegevens wissen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3406861..855ff42 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Nie można ukończyć pobierania. Za mało miejsca."</string>
<string name="download_length_required" msgid="9038605488460437406">"Pobieranie niemożliwe. Nie można ustalić rozmiaru elementu."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Pobieranie zostało przerwane. Nie można go wznowić."</string>
+ <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="7341075135051829692">"Kliknij, aby zwolnić miejsce."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Wyczyść zapisane dane"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Wyczyść zapisane dane"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1f7510c..b13889c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Não é possível concluir a transferência. Não existe espaço suficiente."</string>
<string name="download_length_required" msgid="9038605488460437406">"Não é possível transferir porque o tamanho do item é indeterminado."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"A transferência foi interrompida e não pode ser retomada."</string>
+ <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="7341075135051829692">"Clique para libertar espaço."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Limpar dados armazenados"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Limpar dados armazenados"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f62b502..6ff3f45 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Não é possível concluir o download. Não há espaço suficiente."</string>
<string name="download_length_required" msgid="9038605488460437406">"Não é possível fazer o download. O tamanho do item não pode ser determinado."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Download interrompido. Não é possível retomar."</string>
+ <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="7341075135051829692">"Clique para liberar espaço."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Limpar dados armazenados"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Limpar dados armazenados"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8686f9c..d6e7032 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Невозможно завершить загрузку. Недостаточно места."</string>
<string name="download_length_required" msgid="9038605488460437406">"Загрузка невозможна. Размер файла не определен."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Загрузка прервана и не может быть возобновлена."</string>
+ <string name="search_the_web" msgid="6046130189241962337">"Поиск в Интернете"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Память браузера переполнена"</string>
<string name="webstorage_outofspace_notification_text" msgid="7341075135051829692">"Нажмите, чтобы освободить место."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Удалить сохраненные данные"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Удалить сохраненные данные"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 917ed67..f6a3426 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"Det går inte att hämta. Det finns inte tillräckligt med utrymme."</string>
<string name="download_length_required" msgid="9038605488460437406">"Det går inte att hämta eftersom objektets storlek inte kan avläsas."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Hämtningen avbröts. Den kan inte återupptas."</string>
+ <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="7341075135051829692">"Klicka om du vill frigöra utrymme."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Ta bort sparade data"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Ta bort sparade data"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e526f80..2998dec 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"İndirme işlemi tamamlanamıyor. Yeterli alan yok."</string>
<string name="download_length_required" msgid="9038605488460437406">"İndirilemiyor. Öğenin boyutu belirlenemiyor."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"İndirme işlemi kesintiye uğradı. Sürdürülemez."</string>
+ <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="7341075135051829692">"Alan açmak için tıklayın."</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"Depolanmış verileri temizle"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"Depolanmış verileri temizle"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4821fff..d5f7059 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"无法完成下载，存储空间不足。"</string>
<string name="download_length_required" msgid="9038605488460437406">"无法下载，因为无法确定该下载项的大小。"</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"下载中断，无法重新开始。"</string>
+ <string name="search_the_web" msgid="6046130189241962337">"搜索网页"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"浏览器存储空间已满"</string>
<string name="webstorage_outofspace_notification_text" msgid="7341075135051829692">"点击可释放空间。"</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"清除存储的数据"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"清除存储的数据"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4efbf5d..9e05fd7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -260,6 +260,8 @@
<string name="download_file_error" msgid="1206648050615176113">"無法完成下載。儲存空間不足。"</string>
<string name="download_length_required" msgid="9038605488460437406">"無法下載。物件大小無法估計。"</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"下載中斷。無法續傳。"</string>
+ <string name="search_the_web" msgid="6046130189241962337">"搜尋網頁"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"瀏覽器儲存空間已滿"</string>
<string name="webstorage_outofspace_notification_text" msgid="7341075135051829692">"按一下可釋出儲存空間。"</string>
<string name="webstorage_clear_data_title" msgid="689484577124333977">"清除儲存的資料"</string>
<string name="webstorage_clear_data_dialog_title" msgid="345457466368974706">"清除儲存的資料"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 977fddd..28ee6a3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -665,9 +665,6 @@
interrupted and cannot be resumed -->
<string name="download_precondition_failed">Download interrupted. It cannot be resumed.</string>
-
- <!-- Do not translate. Testing only -->
-
<!-- Do not translate. Testing only -->
<string name="dump_nav" translatable="false">Dump navigation cache</string>
<!-- Do not translate. Testing only -->
@@ -714,30 +711,10 @@
<!-- Bookmark name for Picasa website -->
<string name="picasa" translatable="false">Picasa</string>
- <!-- Note that this is the standard search url. It uses the current locale for language -->
- <!-- (%1$s) and country (%2$s) and shouldn't need to be replaced by locale or mcc selected -->
- <!-- resources. -->
- <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) -->
- <!-- should be mirrored by changes in apps/GoogleSearch. -->
- <!-- Do not translate. This string is an internal URI, not seen in the UI. -->
-
-
<!-- The description of the suggestion that lets the user search the web for the query currently
in the text field. -->
<string name="search_the_web">Search the web</string>
- <!-- FIXME: the next four strings(read/write history permissions) should be removed.
- At the moment actually removing them requires manually deleting all of the
- existing translations. -->
- <!-- Do not translate -->
-
- <!-- Do not translate -->
-
- <!-- Do not translate -->
-
- <!-- Do not translate -->
-
-
<!-- HTML5 dialogs -->
<!-- Used as a status bar notification when the browser is running out of space trying to allocate or increase the database quota for an HTML5 databae or application cache. -->
<string name="webstorage_outofspace_notification_title">Browser storage full</string>
diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index 03e3e5d..241b33b 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -28,6 +28,7 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
+import android.os.Looper;
import android.provider.Browser;
import android.provider.Browser.BookmarkColumns;
import android.view.KeyEvent;
@@ -551,7 +552,7 @@
private class ChangeObserver extends ContentObserver {
public ChangeObserver() {
- super(new Handler());
+ super(new Handler(Looper.getMainLooper()));
}
@Override
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 7dd85aa..a824a84 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -33,6 +33,7 @@
import android.graphics.Rect;
import android.graphics.RectF;
import android.net.Uri;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -235,17 +236,17 @@
mIconSize = getResources().getDimensionPixelSize(
android.R.dimen.app_icon_size);
- if (Intent.ACTION_CREATE_SHORTCUT.equals(getIntent().getAction())) {
+ Intent intent = getIntent();
+ if (Intent.ACTION_CREATE_SHORTCUT.equals(intent.getAction())) {
mCreateShortcut = true;
}
- mDisableNewWindow = getIntent().getBooleanExtra("disable_new_window",
+ mDisableNewWindow = intent.getBooleanExtra("disable_new_window",
false);
- mMostVisited = getIntent().getBooleanExtra("mostVisited", false);
+ mMostVisited = intent.getBooleanExtra("mostVisited", false);
if (mCreateShortcut) {
setTitle(R.string.browser_bookmarks_page_bookmarks_text);
}
- mHandler.obtainMessage(CREATE_ADAPTER).sendToTarget();
setContentView(R.layout.empty_history);
mEmptyView = findViewById(R.id.empty_view);
@@ -264,6 +265,27 @@
PREF_BOOKMARK_VIEW_MODE, BookmarkViewMode.GRID.ordinal())];
}
switchViewMode(preference);
+
+ final boolean createShortcut = mCreateShortcut;
+ final boolean mostVisited = mMostVisited;
+ final String url = intent.getStringExtra("url");
+ final String title = intent.getStringExtra("title");
+ final Bitmap thumbnail =
+ (Bitmap) intent.getParcelableExtra("thumbnail");
+ new AsyncTask<Void, Void, Void>() {
+ @Override
+ protected Void doInBackground(Void... unused) {
+ BrowserBookmarksAdapter adapter = new BrowserBookmarksAdapter(
+ BrowserBookmarksPage.this,
+ url,
+ title,
+ thumbnail,
+ createShortcut,
+ mostVisited);
+ mHandler.obtainMessage(ADAPTER_CREATED, adapter).sendToTarget();
+ return null;
+ }
+ }.execute();
}
@Override
@@ -361,7 +383,7 @@
ViewGroup.LayoutParams.MATCH_PARENT);
private static final int SAVE_CURRENT_PAGE = 1000;
- private static final int CREATE_ADAPTER = 1001;
+ private static final int ADAPTER_CREATED = 1001;
private final Handler mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
@@ -369,15 +391,8 @@
case SAVE_CURRENT_PAGE:
saveCurrentPage();
break;
- case CREATE_ADAPTER:
- Intent intent = getIntent();
- mBookmarksAdapter = new BrowserBookmarksAdapter(
- BrowserBookmarksPage.this,
- intent.getStringExtra("url"),
- intent.getStringExtra("title"),
- (Bitmap) intent.getParcelableExtra("thumbnail"),
- mCreateShortcut,
- mMostVisited);
+ case ADAPTER_CREATED:
+ mBookmarksAdapter = (BrowserBookmarksAdapter) msg.obj;
mBookmarksAdapter.switchViewMode(mViewMode);
if (mGridPage != null) {
mGridPage.setAdapter(mBookmarksAdapter);
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index 2c25534..fc39f36 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -280,6 +280,9 @@
mTitle.setEllipsize(null);
mRtButton.setVisibility(View.VISIBLE);
mStopButton.setVisibility(View.GONE);
+ mTitleBg.setBackgroundDrawable(titleDrawable);
+ mTitleBg.setPadding(mLeftMargin, getPaddingTop(), mRightMargin,
+ getPaddingBottom());
} else {
if (mInLoad) {
titleDrawable = mLoadingBackground;
@@ -292,10 +295,10 @@
mRtButton.setImageDrawable(mBookmarkDrawable);
}
mTitle.setEllipsize(TextUtils.TruncateAt.END);
+ mTitleBg.setBackgroundDrawable(titleDrawable);
+ mTitleBg.setPadding(mLeftMargin, 0, mRightMargin, 0);
}
mTitle.setSingleLine(!mInVoiceMode);
- mTitleBg.setBackgroundDrawable(titleDrawable);
- mTitleBg.setPadding(mLeftMargin, 0, mRightMargin, 0);
}
/**
