Merge "Use ConnectionManager to restart loaders" into jb-mr2-dev
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ab5d21e..68ea2c4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> ከ<xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"እንደገና ሞክር"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"ምስል መጫን አልተቻለም"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d791e9e..eadb238 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> من <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"إعادة المحاولة"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"تعذر تحميل الصورة"</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2a48384..b759201 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> з <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Паўтарыць спробу"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Не атрымалася загрузіць выяву"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 592f581..8bea5fb 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> от <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Нов опит"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Изображ. не можа да се зареди"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 86327bd..dd95949 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> de <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Torna-ho a provar"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"No s\'ha pogut carregar la imatge"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0bf9e45..a34739f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> z <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Opakovat"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Fotografii nelze načíst"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8631f2d..8dac0d1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> af <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Forsøg igen"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Billedet kunne ikke indlæses"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 70951e5..bae72a2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> von <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Wiederholen"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Fehler beim Laden des Bildes"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8aa05b9..c235c3e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> de <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Intentar nuevamente"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"No se pudo cargar la imagen."</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0fac67e..d87b0e2 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g>/<xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Proovi uuesti"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Kujutist ei õnnestunud laadida"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 5edff2e..9053cfb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> از <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"سعی مجدد"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"تصویر بارگیری نشد"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9876c31..f2a1193 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g>/<xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Yritä uudelleen"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Kuvan lataus epäonnistui"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b76dff5..2e004f0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> sur <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Réessayer"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Impossible de charger l\'image."</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 48deab0..fd781d9 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="COUNT">%d</xliff:g> में से <xliff:g id="CURRENT_POS">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"पुनः प्रयास करें"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"चित्र लोड नहीं किया जा सका"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a22582b..69af950 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> od <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Pokušaj ponovo"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Nije moguće učitati sliku"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9f33779..d2a4722 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> dari <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Coba lagi"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Tidak dapat memuat gambar"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ab69f91..a2d9416 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> di <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Riprova"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Impossibile caricare immagine"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index defd0f0..d85d629 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> מתוך <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"נסה שנית"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"לא ניתן היה לטעון את התמונה"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f7868de..5f77114 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g>/<xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"再試行"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"画像を読み込めませんでした"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 47b83d5..ef89a68 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g>/<xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"다시 시도"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"이미지를 로드할 수 없음"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 483bfef..c1a5687 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> iš <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Bandyti dar kartą"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Nepavyko įkelti vaizdo"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 8ff4fff..40e188d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g>. no <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Mēģināt vēlreiz"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Nevarēja ielādēt attēlu."</string>
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 16dac1b..fa1c78c 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> daripada <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Cuba semula"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Tidak dapat memuatkan imej"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index bd30af1..d5be2e8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> av <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Prøv på nytt"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Kan ikke laste inn bildet"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 19628c6..c4e7ac6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> van <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Opnieuw proberen"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Kan afbeelding niet laden"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e9180a1..9160a47 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> z <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Spróbuj ponownie"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Nie można wczytać obrazu"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c652340..cd7e6e6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> de <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Tentar novamente"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Não foi poss. carregar imagem"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c652340..613ae90 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> de <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Tentar novamente"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Impossível carregar a imagem"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bbda6d5..41535de 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> din <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Reîncercaţi"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Imaginea nu s-a putut încărca"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 53e3439..2d91762 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> из <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Повторить"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Не удалось загрузить фото"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 14f02b9..6d0dff2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> z <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Skúsiť znovu"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Obrázok sa nepodarilo načítať"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bff039b..e0b8255 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> od <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Znova"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Slike ni bilo mogoče naložiti"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9076d69..ebf2059 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> од <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Покушај поново"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Није могуће учитати слику"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 728563e..70aef72 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> av <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Försök igen"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Bilden gick inte att läsa in"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index de46610..22d31e2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> ya <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Jaribu tena"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Haikuweza kupakia picha"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b5745e2..11aed11 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> จาก <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"ลองอีกครั้ง"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"ไม่สามารถโหลดภาพ"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3ca3b20..f2f43a4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> ng <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Subukang muli"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Hindi ma-load ang larawan"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 14a11ed..dfe0b11 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> / <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Yeniden dene"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Resim yüklenemedi"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0ac7aee..da0c3a4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> з <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Повторити"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Зображення не завантажено"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4ca9782..c22bbcc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> trong số <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Thử lại"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Không thể tải ảnh"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2559c5a..51a8856 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"第 <xliff:g id="CURRENT_POS">%d</xliff:g> 张，共 <xliff:g id="COUNT">%d</xliff:g> 张"</string>
<string name="retry" msgid="3319517143224679074">"重试"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"无法加载图片"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 68a4841..5d2d6f0 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"第 <xliff:g id="CURRENT_POS">%d</xliff:g> 張 (共 <xliff:g id="COUNT">%d</xliff:g> 張)"</string>
<string name="retry" msgid="3319517143224679074">"重試"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"無法載入圖片"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9353fe3..bc1a52c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -20,6 +20,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> kwe-<xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Zama futhi"</string>
- <!-- no translation found for failed (1458877219699376279) -->
- <skip />
+ <string name="failed" msgid="1458877219699376279">"Ayikwazanga ukulayisha isithombe"</string>
</resources>
diff --git a/src/com/android/ex/photo/PhotoViewActivity.java b/src/com/android/ex/photo/PhotoViewActivity.java
index a772424..30bc916 100644
--- a/src/com/android/ex/photo/PhotoViewActivity.java
+++ b/src/com/android/ex/photo/PhotoViewActivity.java
@@ -182,6 +182,7 @@
final Resources resources = getResources();
mRootView = findViewById(R.id.photo_activity_root_view);
mViewPager = (PhotoViewPager) findViewById(R.id.photo_view_pager);
+ mViewPager.setAdapter(mAdapter);
mViewPager.setOnPageChangeListener(this);
mViewPager.setOnInterceptTouchListener(this);
mViewPager.setPageMargin(resources.getDimensionPixelSize(R.dimen.photo_page_margin));
diff --git a/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java b/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
index c29b14f..ca92050 100644
--- a/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
+++ b/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
@@ -51,13 +51,11 @@
if (context != null && mPhotoUri != null) {
final ContentResolver resolver = context.getContentResolver();
try {
- Bitmap bitmap = ImageUtils.createLocalBitmap(resolver, Uri.parse(mPhotoUri),
+ result = ImageUtils.createLocalBitmap(resolver, Uri.parse(mPhotoUri),
PhotoViewFragment.sPhotoSize);
- if (bitmap != null) {
- bitmap.setDensity(DisplayMetrics.DENSITY_MEDIUM);
+ if (result.bitmap != null) {
+ result.bitmap.setDensity(DisplayMetrics.DENSITY_MEDIUM);
}
- result.status = BitmapResult.STATUS_SUCCESS;
- result.bitmap = bitmap;
} catch (UnsupportedOperationException ex) {
// We got image bytes, but unable to decode to a Bitmap
result.status = BitmapResult.STATUS_EXCEPTION;
@@ -170,7 +168,7 @@
}
}
- public class BitmapResult {
+ public static class BitmapResult {
public static final int STATUS_SUCCESS = 0;
public static final int STATUS_EXCEPTION = 1;
diff --git a/src/com/android/ex/photo/util/ImageUtils.java b/src/com/android/ex/photo/util/ImageUtils.java
index 9c7189c..0db064e 100644
--- a/src/com/android/ex/photo/util/ImageUtils.java
+++ b/src/com/android/ex/photo/util/ImageUtils.java
@@ -29,7 +29,7 @@
import android.util.Log;
import com.android.ex.photo.PhotoViewActivity;
-import com.android.ex.photo.util.Exif;
+import com.android.ex.photo.loaders.PhotoBitmapLoader.BitmapResult;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -97,15 +97,17 @@
*
* @return The new bitmap or null
*/
- public static Bitmap createLocalBitmap(ContentResolver resolver, Uri uri, int maxSize) {
+ public static BitmapResult createLocalBitmap(ContentResolver resolver, Uri uri, int maxSize) {
// TODO: make this method not download the image for both getImageBounds and decodeStream
+ BitmapResult result = new BitmapResult();
InputStream inputStream = null;
try {
final BitmapFactory.Options opts = new BitmapFactory.Options();
final Point bounds = getImageBounds(resolver, uri);
inputStream = openInputStream(resolver, uri);
if (bounds == null || inputStream == null) {
- return null;
+ result.status = BitmapResult.STATUS_EXCEPTION;
+ return result;
}
opts.inSampleSize = Math.max(bounds.x / maxSize, bounds.y / maxSize);
@@ -114,16 +116,18 @@
// Correct thumbnail orientation as necessary
// TODO: Fix rotation if it's actually a problem
//return rotateBitmap(resolver, uri, decodedBitmap);
- return decodedBitmap;
+ result.bitmap = decodedBitmap;
+ result.status = BitmapResult.STATUS_SUCCESS;
+ return result;
} catch (FileNotFoundException exception) {
// Do nothing - the photo will appear to be missing
} catch (IOException exception) {
- // Do nothing - the photo will appear to be missing
+ result.status = BitmapResult.STATUS_EXCEPTION;
} catch (IllegalArgumentException exception) {
// Do nothing - the photo will appear to be missing
} catch (SecurityException exception) {
- // Do nothing - the photo will appear to be missing
+ result.status = BitmapResult.STATUS_EXCEPTION;
} finally {
try {
if (inputStream != null) {
@@ -132,7 +136,7 @@
} catch (IOException ignore) {
}
}
- return null;
+ return result;
}
/**
