Merge change Id9898b22 into eclair
* changes:
Check to make sure the captured picture is non null before using.
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8e1e316..758c3d8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Testovací verze prohlížeče"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</string>
<string name="search_the_web" msgid="6046130189241962337">"Vyhledat na webu"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Paměť prohlížeče je plná"</string>
<string name="webstorage_outofspace_notification_text" msgid="7341075135051829692">"Kliknutím uvolníte místo."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index cad0e00..e5c4ede 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -262,7 +262,6 @@
<string name="download_length_required" msgid="9038605488460437406">"Der kan ikke downloades. Størrelsen på elementet kan ikke afgøres."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Download blev afbrudt. Den kan ikke genoptages."</string>
<string name="activity_instrumentation_test_runner" msgid="8215091309334005029">"Browsertestkørsel"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 54614d5..071592a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Browser Test Runner"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4c310ec..5b1c029 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -262,7 +262,6 @@
<string name="download_length_required" msgid="9038605488460437406">"Δεν είναι δυνατή η λήψη. Δεν είναι δυνατός ο προσδιορισμός του μεγέθους του στοιχείου."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Η λήψη διακόπηκε. Δεν είναι δυνατή η συνέχισή της."</string>
<string name="activity_instrumentation_test_runner" msgid="8215091309334005029">"Πρόγραμμα εκτέλεσης δοκιμών προγράμματος περιήγησης"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f5a0e1a..f043920 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Ejecutor de pruebas del navegador"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index fe15479..2a94bfd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Realizador de pruebas del navegador"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b0f2951..2b5f196 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Testeur de navigateur"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index eb63551..ad87b7d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Browser Test Runner"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f30dbda..e519232 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -262,7 +262,6 @@
<string name="download_length_required" msgid="9038605488460437406">"項目のサイズを特定できないため、ダウンロードできません。"</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"ダウンロードが中断されました。再開できません。"</string>
<string name="activity_instrumentation_test_runner" msgid="8215091309334005029">"Browser Test Runner"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d8c87e5..3c07d01 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -262,7 +262,6 @@
<string name="download_length_required" msgid="9038605488460437406">"항목의 크기를 확인할 수 없으므로 다운로드할 수 없습니다."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"다운로드가 중단되었으며 다시 시작할 수 없습니다."</string>
<string name="activity_instrumentation_test_runner" msgid="8215091309334005029">"브라우저 테스트 실행기"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a02340f..3407c24 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Browser Test Runner"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.no/m?client=ms-{CID}"</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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6186806..f258634 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Browser Test Runner"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fbafe04..f628078 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Uruchamianie testów przeglądarki"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8d27686..30bee32 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Teste de browser"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 57fbeff..a3e1acd 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Executador de teste do navegador"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4f09914..4e8bd2e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -262,7 +262,6 @@
<string name="download_length_required" msgid="9038605488460437406">"Загрузка невозможна. Размер файла не определен."</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"Загрузка прервана и не может быть возобновлена."</string>
<string name="activity_instrumentation_test_runner" msgid="8215091309334005029">"Тестирование браузера"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ee2cd0a..1f1d369 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Testprogram för webbläsaren"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ccf9370..62d4f43 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -262,7 +262,6 @@
<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="activity_instrumentation_test_runner" msgid="8215091309334005029">"Tarayıcı Test Aracı"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2a08baa..70614ad 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -262,7 +262,6 @@
<string name="download_length_required" msgid="9038605488460437406">"无法下载，无法确定该项的大小。"</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"下载中断，无法重新开始。"</string>
<string name="activity_instrumentation_test_runner" msgid="8215091309334005029">"浏览器测试运行程序"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index da21156..c8aa573 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -262,7 +262,6 @@
<string name="download_length_required" msgid="9038605488460437406">"無法下載。物件大小無法估計。"</string>
<string name="download_precondition_failed" msgid="8327584102874295580">"下載中斷。無法續傳。"</string>
<string name="activity_instrumentation_test_runner" msgid="8215091309334005029">"Browser Test Runner"</string>
- <string name="homepage_base" msgid="7888126987935305566">"http://www.google.com/m?client=ms-{CID}"</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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8593535..9fd8c87 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -652,7 +652,8 @@
<!-- The default homepage. If it starts with "http://www.google" and the
user signs up the device with a Google sites account, the site's
domain will be appended. -->
- <string name="homepage_base">http://www.google.com/m?client=ms-{CID}&source=android-home</string>
+ <string name="homepage_base" translatable="false">
+ http://www.google.com/m?client=ms-{CID}&source=android-home</string>
<!-- Bookmarks -->
<string-array name="bookmarks" translatable="false">
diff --git a/src/com/android/browser/BrowserBackupAgent.java b/src/com/android/browser/BrowserBackupAgent.java
index fe3b7ea..387555d 100644
--- a/src/com/android/browser/BrowserBackupAgent.java
+++ b/src/com/android/browser/BrowserBackupAgent.java
@@ -46,8 +46,8 @@
* @hide
*/
public class BrowserBackupAgent extends BackupAgent {
- static final String TAG = "BrowserBookmarkAgent";
- static final boolean DEBUG = true;
+ static final String TAG = "BrowserBackupAgent";
+ static final boolean DEBUG = false;
static final String BOOKMARK_KEY = "_bookmarks_";
/** this version num MUST be incremented if the flattened-file schema ever changes */
@@ -147,6 +147,7 @@
// Okay, we have all the bookmarks -- now see if we need to add
// them to the browser's database
int N = bookmarks.size();
+ int nUnique = 0;
if (DEBUG) Log.v(TAG, "Restoring " + N + " bookmarks");
String[] urlCol = new String[] { BookmarkColumns.URL };
for (int i = 0; i < N; i++) {
@@ -158,16 +159,18 @@
BookmarkColumns.BOOKMARK + " == 1 ", null, null);
// if not, insert it
if (cursor.getCount() <= 0) {
- Log.v(TAG, "Did not see url: " + mark.url);
+ if (DEBUG) Log.v(TAG, "Did not see url: " + mark.url);
// Right now we do not reconstruct the db entry in its
// entirety; we just add a new bookmark with the same data
Bookmarks.addBookmark(null, getContentResolver(),
mark.url, mark.title, null, false);
+ nUnique++;
} else {
- Log.v(TAG, "Skipping extant url: " + mark.url);
+ if (DEBUG) Log.v(TAG, "Skipping extant url: " + mark.url);
}
cursor.close();
}
+ Log.i(TAG, "Restored " + nUnique + " of " + N + " bookmarks");
} catch (IOException ioe) {
Log.w(TAG, "Bad backup data; not restoring");
crc = -1;