From 5afc4916f4e6f26ea72ac955466888821b3a070e Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Mon, 29 Aug 2011 13:03:03 -0700 Subject: Revert "Move resource to sync library." This reverts commit 50602e846230d8d944b81c651b11f40c8d21221c. --- res/layout/cache_notification.xml | 34 ++++++++++++++++++++++++++++++++++ res/values-ar/strings.xml | 3 +++ res/values-bg/strings.xml | 3 +++ res/values-ca/strings.xml | 3 +++ res/values-cs/strings.xml | 3 +++ res/values-da/strings.xml | 3 +++ res/values-de/strings.xml | 3 +++ res/values-el/strings.xml | 3 +++ res/values-en-rGB/strings.xml | 3 +++ res/values-es-rUS/strings.xml | 3 +++ res/values-es/strings.xml | 3 +++ res/values-fa/strings.xml | 3 +++ res/values-fi/strings.xml | 3 +++ res/values-fr/strings.xml | 3 +++ res/values-hr/strings.xml | 3 +++ res/values-hu/strings.xml | 3 +++ res/values-in/strings.xml | 3 +++ res/values-it/strings.xml | 3 +++ res/values-iw/strings.xml | 3 +++ res/values-ja/strings.xml | 3 +++ res/values-ko/strings.xml | 3 +++ res/values-lt/strings.xml | 3 +++ res/values-lv/strings.xml | 3 +++ res/values-ms/strings.xml | 3 +++ res/values-nb/strings.xml | 3 +++ res/values-nl/strings.xml | 3 +++ res/values-pl/strings.xml | 3 +++ res/values-pt-rPT/strings.xml | 3 +++ res/values-pt/strings.xml | 3 +++ res/values-ro/strings.xml | 3 +++ res/values-ru/strings.xml | 3 +++ res/values-sk/strings.xml | 3 +++ res/values-sl/strings.xml | 3 +++ res/values-sr/strings.xml | 3 +++ res/values-sv/strings.xml | 3 +++ res/values-th/strings.xml | 3 +++ res/values-tl/strings.xml | 3 +++ res/values-tr/strings.xml | 3 +++ res/values-uk/strings.xml | 3 +++ res/values-vi/strings.xml | 3 +++ res/values-zh-rCN/strings.xml | 3 +++ res/values-zh-rTW/strings.xml | 3 +++ res/values/strings.xml | 9 +++++++++ 43 files changed, 166 insertions(+) create mode 100644 res/layout/cache_notification.xml diff --git a/res/layout/cache_notification.xml b/res/layout/cache_notification.xml new file mode 100644 index 000000000..1ffc504db --- /dev/null +++ b/res/layout/cache_notification.xml @@ -0,0 +1,34 @@ + + + + + + + diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index adf3a6013..6a9446aa5 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -154,6 +154,9 @@ "اختيار صورة" "نوع الأداة" "عرض الشرائح" + "الجلب المسبق لصور بيكاسا:" + "تنزيل %1$s من إجمالي %2$s من الصور" + "اكتمل التنزيل" "ألبومات" "المرات" "المواقع" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index f2732861a..955b871ba 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -154,6 +154,9 @@ "Избиране на изображение" "Тип приспособление" "Слайдшоу" + "Предварит. извличане на снимки в Picasa:" + "Изтегляне на %1$s от %2$s снимки" + "Изтеглянето завърши" "Албуми" "Час" "Mестопол." diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 11dacf298..12fba4eed 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -154,6 +154,9 @@ "Tria una imatge" "Tipus de widget" "Pres. diapositives" + "Obtenció prèvia de fotos de Picasa:" + "Baixada de %1$s de %2$s fotos" + "Baixada completada" "Àlbums" "Vegades" "Ubicacions" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 735fcc205..13f7f5b52 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -154,6 +154,9 @@ "Vybrat obrázek" "Typ widgetu" "Prezentace" + "Předběžné načítání fotografií Picasa:" + "Stáhnout %1$s z %2$s fotografií" + "Stahování bylo dokončeno" "Alba" "Časy" "Lokality" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 621b812f8..ff9069544 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -154,6 +154,9 @@ "Vælg et billede" "Widgettype" "Diasshow" + "Henter Picasa-billeder på forhånd:" + "%1$s downloadet ud af %2$s fotos" + "Download er fuldført" "Albummer" "Tidspunkter" "Placering" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 9bd0d41be..980b2cd8e 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -154,6 +154,9 @@ "Bild auswählen" "Widget-Typ" "Diashow" + "Vorabruf von Picasa-Fotos:" + "%1$s von %2$s Fotos heruntergeladen" + "Download abgeschlossen" "Alben" "Zeiten" "Orte" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index f284a7b76..849b546d5 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -154,6 +154,9 @@ "Επιλέξτε μια εικόνα" "Τύπος γραφ. στοιχ." "Προβολή διαφανειών" + "Προαναζήτηση φωτογραφιών Picasa:" + "Λήψη %1$s από %2$s φωτογρ." + "Ολοκλήρωση λήψης" "Λευκώματα" "Φορές" "Τοποθεσίες" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 639e5417f..78fb22038 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -154,6 +154,9 @@ "Pick an image" "Widget Type" "Slide show" + "Prefetching Picasa photos:" + "Download %1$s of %2$s photos" + "Download complete" "Albums" "Times" "Locations" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 94936de71..2458160c3 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -154,6 +154,9 @@ "Elegir una imagen" "Tipo de widget" "Presentación de diapositivas" + "Obtención previa de fotos de Picasa:" + "Descargar %1$s de %2$s fotos" + "Descarga completa" "Álbumes" "Horarios" "Ubicaciones" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 39820d94d..46ee86544 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -154,6 +154,9 @@ "Seleccionar una imagen" "Tipo de widget" "Presentación" + "Recopilando fotos de Picasa:" + "Descarga: %1$s de %2$s fotos" + "Descarga completada" "Álbumes" "Horas" "Ubicaciones" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index a61058507..37d18047e 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -154,6 +154,9 @@ "یک تصویر انتخاب کنید" "نوع ابزارک" "نمایش اسلاید" + "واکشی اولیه عکس های picasa:" + "دانلود %1$s از %2$s عکس" + "دانلود انجام شد" "آلبوم‌ها" "دفعات" "مکان‌ها" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 44690ffc5..187741de6 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -154,6 +154,9 @@ "Valitse kuva" "Widgetin tyyppi" "Diaesitys" + "Esihaetaan Picasa-kuvia:" + "Ladataan %1$s / %2$s kuvaa" + "Lataus valmis" "Albumit" "Kerrat" "Sijainnit" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 3138f8b90..c00a203fc 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -154,6 +154,9 @@ "Choisir une photo" "Type de widget" "Diaporama" + "Prélecture des photos de Picasa :" + "Téléchargement de %1$s photos sur %2$s" + "Téléchargement terminé" "Albums" "Heures" "Lieux" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 0c973058a..e470c17d1 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -154,6 +154,9 @@ "Odaberi sliku" "Vrsta widgeta" "Dijaprojekcija" + "Pretpreuzimanje Picasa fotografija:" + "Preuzmite %1$s od fotografija: %2$s" + "Preuzimanje je dovršeno" "Albumi" "Vremena" "Lokacije" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index cb9fcbb45..f0f1adcac 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -154,6 +154,9 @@ "Válasszon egy képet" "Modul típusa" "Diavetítés" + "Picasa-fényképek előzetes lekérése" + "%1$s/%2$s fotó letöltése" + "A letöltés befejeződött" "Albumok" "Alkalom" "Helyek" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index c404b8cd0..6a1e0ecad 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -154,6 +154,9 @@ "Pilih gambar" "Jenis Gawit" "Rangkai salindia" + "Mengambil foto picasa lebih dulu:" + "Mengunduh %1$s dari %2$s foto" + "Unduhan selesai" "Album" "Waktu" "Lokasi" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 4e3950890..a563a2562 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -154,6 +154,9 @@ "Scegli un\'immagine" "Tipo di widget" "Presentazione" + "Precaricamento delle foto di Picasa:" + "Download di %1$s di %2$s foto" + "Download completato" "Album" "Volte" "Luoghi" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 4bad40419..4906709f9 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -154,6 +154,9 @@ "בחר תמונה" "סוג Widget" "מצגת שקופיות" + "אחזור מראש של תמונות \'אלבומי Google\':" + "הורד %1$s מתוך %2$s תמונות" + "ההורדה הושלמה" "אלבומים" "פעמים" "מיקומים" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index e90228c93..f1e9ee12c 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -154,6 +154,9 @@ "画像を選択" "ウィジェットタイプ" "スライドショー" + "Picasaの画像をプリフェッチ:" + "%1$s/%2$s件の画像をダウンロード" + "ダウンロード完了" "アルバム" "時間" "ロケーション" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 89571f01c..696282301 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -154,6 +154,9 @@ "이미지 선택" "위젯 유형" "슬라이드쇼" + "Picasa 사진 미리 가져오기:" + "사진 %2$s개 중 %1$s개 다운로드" + "다운로드 완료" "앨범" "횟수" "위치" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 37f058758..ed71ae808 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -154,6 +154,9 @@ "Pasirinkite vaizdą" "Valdiklio tipas" "Skaidrių demonstrac." + "Iš anksto pateikiamos „Picasa“ nuotr.:" + "%1$s nuotr. iš %2$s atsisiuntimas" + "Atsisiuntimas baigtas" "Albumai" "Kartai" "Vietos" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 034711cbc..555fbedab 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -154,6 +154,9 @@ "Izvēlēties attēlu" "Logrīka veids" "Slaidrāde" + "Notiek Picasa fotoattēlu priekšienese" + "Lejupielād. %1$s fotoattēls(-i) no %2$s" + "Lejupielāde pabeigta" "Albumi" "Reizes" "Vietas" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index f99675fc1..45df59ed8 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -154,6 +154,9 @@ "Pilih imej" "Jenis Widget" "Tayangan slaid" + "Pra-ambil foto picasa:" + "Muat turun %1$s daripada %2$s foto" + "Muat turun selesai" "Album" "Masa" "Lokasi" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index cb2fa8183..2b776e8cd 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -154,6 +154,9 @@ "Velg et bilde" "Modultype" "Lysbildefremvisning" + "Forhåndshenter Picasa-bilder:" + "Last ned %1$s av %2$s bilder" + "Nedlasting er fullført" "Album" "Ganger" "Steder" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 54012fadb..7bd7ac2b1 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -154,6 +154,9 @@ "Een afbeelding kiezen" "Widgettype" "Diavoorstelling" + "Picasa-foto\'s prefetchen:" + "%1$s van %2$s foto\'s downloaden" + "Downloaden is voltooid" "Albums" "Opnametijden" "Locaties" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 2daa1e87d..d4bccb0de 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -154,6 +154,9 @@ "Wybierz obraz" "Typ widżetu" "Pokaz slajdów" + "Pobieranie zdjęć Picasa w tle:" + "Pobieranie zdjęć: %1$s z %2$s" + "Zakończono pobieranie" "Albumy" "Godziny" "Lokalizacje" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index bbcefd17e..08008a2ed 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -154,6 +154,9 @@ "Escolher imagem" "Tipo de Widget" "Apres. de diap." + "Pré-obtenção de fotografias do Picasa:" + "Transferir %1$s de %2$s fotografias" + "Transferência concluída" "Álbuns" "Vezes" "localizações" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 9d406abbf..e0db475ad 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -154,6 +154,9 @@ "Escolha uma imagem" "Tipo de widget" "Apresent. de slides" + "Fazendo pré-busca de fotos do picasa:" + "Download %1$s de %2$s fotos" + "Download concluído" "Álbuns" "Vezes" "Locais" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 189034b05..2f97958d3 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -154,6 +154,9 @@ "Alegeţi o imagine" "Tip de obiect widget" "Slideshow" + "Preîncărcare fotografii Picasa:" + "Descarcă %1$s din %2$s (de) fotografii" + "Descărcare completă" "Albume" "Ore" "Locaţii" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 4c9b3f332..d94f36677 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -154,6 +154,9 @@ "Выбрать картинку" "Тип виджета" "Слайд-шоу" + "Предвыборка фотографий Picasa:" + "Загружено фотографий: %1$s из %2$s" + "Загрузка завершена" "Альбомы" "По времени" "Места" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 2d57030b7..c1b6a20b9 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -154,6 +154,9 @@ "Vyberte obrázok" "Typ miniaplikácie" "Prezentácia" + "Predbežne načítať fotografie Picasa:" + "Prevziať %1$s z %2$s fotografií" + "Preberanie bolo dokončené" "Albumy" "Časy" "Miesta" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 1b5d4670a..19dae2c72 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -154,6 +154,9 @@ "Izberite sliko" "Vrsta pripomočka" "Diaprojekcija" + "Vnaprejšnji prenos fotografij iz Picase:" + "Prenos %1$s od %2$s fotografij" + "Prenos je končan" "Albumi" "Časi" "Lokacije" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index d6ad900ff..b22d6e19a 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -154,6 +154,9 @@ "Изабери слику" "Тип виџета" "Пројекција слајдова" + "Учитавање picasa фотографија унапред:" + "Преузимање %1$s од %2$s фотографије(а)" + "Преузимање је завршено" "Албуми" "Пута" "Локације" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index fdceff560..e6d9bcf31 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -154,6 +154,9 @@ "Välj en bild" "Widgettyp" "Bildspel" + "Bilder från Picasa förhandshämtas:" + "Hämta %1$s av %2$s bilder" + "Hämtningen har slutförts" "Album" "Tider" "Platser" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index fee8cd0ae..5e2710e73 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -154,6 +154,9 @@ "เลือกภาพ" "ประเภทวิดเจ็ต" "สไลด์โชว์" + "กำลังโหลดภาพถ่าย Picasa ล่วงหน้า:" + "ดาวน์โหลดภาพถ่าย %1$s จาก %2$s ภาพ" + "การดาวน์โหลดเสร็จสมบูรณ์" "อัลบั้ม" "เวลา" "สถานที่" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index dd0e02cb1..75d7e6356 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -154,6 +154,9 @@ "Pumili ng larawan" "Uri ng Widget" "Slideshow" + "Paunang kumukuha ng mga larawang picasa:" + "I-download ang %1$s ng %2$s (na) larawan" + "Kumpleto na ang pag-download" "Mga Album" "Beses" "Mga Lokasyon" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 37d48e4e5..d1c33eb00 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -154,6 +154,9 @@ "Resim seçin" "Widget Türü" "Slayt gösterisi" + "Picasa fotoğrafları önceden getiriliyor:" + "%2$s fotoğraftan %1$s tanesi indirildi" + "İndirme tamamlandı" "Albümler" "Saatler" "Konumlar" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 64dac4bc5..a20460545 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -154,6 +154,9 @@ "Вибрати зображення" "Тип віджета" "Слайд-шоу" + "Попередня вибірка фотографій Picasa:" + "Завантажити %1$s з %2$s фото" + "Завантаження закінчено" "Альбоми" "Час" "Місцезнах." diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 369f49cc0..c60b3b4e8 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -154,6 +154,9 @@ "Chọn một hình ảnh" "Loại tiện ích con" "Trình chiếu" + "Tìm nạp trước ảnh picasa:" + "Tải xuống %1$s trong tổng số %2$s ảnh" + "Tải xuống hoàn tất" "Anbom" "Lần" "Vị trí" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 386e303de..f06abb1d8 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -154,6 +154,9 @@ "选择一张图片" "窗口小部件类型" "幻灯片" + "预先抓取 Picasa 照片：" + "已下载 %1$s 张照片，共 %2$s 张" + "下载完成" "相册" "时间" "地点" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index f92684d55..024669829 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -154,6 +154,9 @@ "選擇圖片" "小工具類型" "投影播放" + "正在預先擷取 Picasa 相片：" + "下載 %1$s 張相片 (共 %2$s 張)" + "下載完成" "相簿" "次數" "位置" diff --git a/res/values/strings.xml b/res/values/strings.xml index 0e0db1242..9f6cce8f0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -389,6 +389,15 @@ Slideshow + + Prefetching picasa photos: + + + Download %1$s of %2$s photos + + + Download complete + Albums -- cgit v1.2.3 From 0b4d5c5a5834d0113068959c57e0e10bf919a081 Mon Sep 17 00:00:00 2001 From: Ray Chen Date: Mon, 29 Aug 2011 18:39:55 +0800 Subject: Fix 4975579 PTP: Unable to load the thumbnails while connected to camera There's a deadlock in threadpool. The fix has been verified. Change-Id: I000527f55fc2a3777bd4bb06817a9967b2f50488 --- src/com/android/gallery3d/data/MtpImage.java | 11 ++--------- src/com/android/gallery3d/ui/ActionModeHandler.java | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/com/android/gallery3d/data/MtpImage.java b/src/com/android/gallery3d/data/MtpImage.java index e0e5481d9..218f70483 100644 --- a/src/com/android/gallery3d/data/MtpImage.java +++ b/src/com/android/gallery3d/data/MtpImage.java @@ -78,8 +78,8 @@ public class MtpImage extends MediaItem { public Job requestImage(int type) { return new Job() { public Bitmap run(JobContext jc) { - GetThumbnailBytes job = new GetThumbnailBytes(); - byte[] thumbnail = mThreadPool.submit(job).get(); + byte[] thumbnail = mMtpContext.getMtpClient().getThumbnail( + UsbDevice.getDeviceName(mDeviceId), mObjectId); if (thumbnail == null) { Log.w(TAG, "decoding thumbnail failed"); return null; @@ -116,13 +116,6 @@ public class MtpImage extends MediaItem { return SUPPORT_FULL_IMAGE | SUPPORT_IMPORT; } - private class GetThumbnailBytes implements Job { - public byte[] run(JobContext jc) { - return mMtpContext.getMtpClient().getThumbnail( - UsbDevice.getDeviceName(mDeviceId), mObjectId); - } - } - public void updateContent(MtpObjectInfo info) { if (mObjectId != info.getObjectHandle() || mDateTaken != info.getDateCreated()) { mObjectId = info.getObjectHandle(); diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java index 493c7c5b2..fbe582523 100644 --- a/src/com/android/gallery3d/ui/ActionModeHandler.java +++ b/src/com/android/gallery3d/ui/ActionModeHandler.java @@ -188,16 +188,18 @@ public class ActionModeHandler implements ActionMode.Callback { operation &= SUPPORT_MULTIPLE_MASK; } - + final int size = uris.size(); Log.v(TAG, "Sharing intent MIME type=" + mimeType + ", uri size = "+ uris.size()); - if (uris.size() > 1) { - intent.setAction(Intent.ACTION_SEND_MULTIPLE).setType(mimeType); - intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris); - } else { - intent.setAction(Intent.ACTION_SEND).setType(mimeType); - intent.putExtra(Intent.EXTRA_STREAM, uris.get(0)); + if (size > 0) { + if (size > 1) { + intent.setAction(Intent.ACTION_SEND_MULTIPLE).setType(mimeType); + intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris); + } else { + intent.setAction(Intent.ACTION_SEND).setType(mimeType); + intent.putExtra(Intent.EXTRA_STREAM, uris.get(0)); + } + intent.setType(mimeType); } - intent.setType(mimeType); final int supportedOperation = operation; @@ -207,7 +209,7 @@ public class ActionModeHandler implements ActionMode.Callback { mMenuTask = null; MenuExecutor.updateMenuOperation(mMenu, supportedOperation); - if (mShareActionProvider != null) { + if (mShareActionProvider != null && size > 0) { Log.v(TAG, "Sharing intent is ready: action = " + intent.getAction()); mShareActionProvider.setShareIntent(intent); } -- cgit v1.2.3 From efb4bc67eecf468d8b9b49e644fc9230bded122d Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Tue, 30 Aug 2011 11:33:24 -0700 Subject: bug #5234237: fix NPE in Gallery - mActivity.getGalleryActionBar() can return null, check for null before using it. Change-Id: Ib84d5d56e51e6098adee9323c5e8d5c78f9a76e8 --- src/com/android/gallery3d/app/AlbumSetPage.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 6542be1d2..958f9b21d 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -257,8 +257,11 @@ public class AlbumSetPage extends ActivityState implements mSubtitle = data.getString(AlbumSetPage.KEY_SET_SUBTITLE); mEyePosition = new EyePosition(mActivity.getAndroidContext(), this); mDetailsSource = new MyDetailsSource(); - mActivity.getGalleryActionBar().setSelectedTab(data.getInt( - AlbumSetPage.KEY_SELECTED_TAB_TYPE, FilterUtils.CLUSTER_BY_ALBUM)); + GalleryActionBar actionBar = mActivity.getGalleryActionBar(); + if (actionBar != null) { + actionBar.setSelectedTab(data.getInt( + AlbumSetPage.KEY_SELECTED_TAB_TYPE, FilterUtils.CLUSTER_BY_ALBUM)); + } startTransition(); } -- cgit v1.2.3