am 9860d23d: (-s ours) DO NOT MERGE: Fix NPE in PhotoViewActivity
* commit '9860d23d1eb9e2c00a820a98ec25550e139f1e35':
DO NOT MERGE: Fix NPE in PhotoViewActivity
diff --git a/res/drawable/default_image.png b/res/drawable/default_image.png
deleted file mode 100644
index f6e6e60..0000000
--- a/res/drawable/default_image.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/default_image.xml b/res/drawable/default_image.xml
new file mode 100644
index 0000000..0a4369a
--- /dev/null
+++ b/res/drawable/default_image.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+
+ <!-- these are the dimensions of the original default_image.png -->
+ <size
+ android:width="215dp"
+ android:height="210dp" />
+
+ <solid
+ android:color="#ccc" />
+
+</shape>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 9c3ca85..b2d43c1 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -20,4 +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">"Herprobeer"</string>
+ <string name="failed" msgid="1458877219699376279">"Kon nie prent laai nie"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e1506bb..68ea2c4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"ምስል መጫን አልተቻለም"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d98e088..eadb238 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"تعذر تحميل الصورة"</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 93304c7..b759201 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"Не атрымалася загрузіць выяву"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 58d4a2b..8bea5fb 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"Изображ. не можа да се зареди"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4d46071..dd95949 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -20,4 +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>
+ <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 0d51d1b..a34739f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -20,4 +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>
+ <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 fc9dd30..8dac0d1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,4 +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>
+ <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 14bb59c..bae72a2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"Fehler beim Laden des Bildes"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3292172..f2e8600 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"Αδύνατη η φόρτωση της εικόνας"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c6e5289..880c1c3 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -20,4 +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> of <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="retry" msgid="3319517143224679074">"Retry"</string>
+ <string name="failed" msgid="1458877219699376279">"Couldn\'t load image"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ffa0414..c235c3e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"No se pudo cargar la imagen."</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9fa6031..10da26c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -20,4 +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">"Volver a intentar"</string>
+ <string name="failed" msgid="1458877219699376279">"Error al cargar la imagen"</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 888c1f9..d87b0e2 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -20,4 +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>
+ <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 5ebd26b..9053cfb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"تصویر بارگیری نشد"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ea9ccc8..f2a1193 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -20,4 +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>
+ <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 6a55c27..2e004f0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,4 +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>
+ <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 54d9612..fd781d9 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"चित्र लोड नहीं किया जा सका"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e10f61a..69af950 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"Nije moguće učitati sliku"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bb5afbe..3434ac7 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -20,4 +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">"Újra"</string>
+ <string name="failed" msgid="1458877219699376279">"A kép betöltése sikertelen."</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d982638..d2a4722 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -20,4 +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>
+ <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 77bf13a..a2d9416 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -20,4 +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>
+ <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 450b159..d85d629 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"לא ניתן היה לטעון את התמונה"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0362113..5f77114 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"画像を読み込めませんでした"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 150112d..47b83d5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -20,4 +20,6 @@
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 />
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7c32566..c1a5687 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -20,4 +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>
+ <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 0857782..40e188d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -20,4 +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>
+ <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 ec0d23a..fa1c78c 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -20,4 +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>
+ <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 b533fc9..d5be2e8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -20,4 +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>
+ <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 e61b149..c4e7ac6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,4 +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>
+ <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 fe33696..9160a47 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,4 +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>
+ <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 cc62c4a..cd7e6e6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -20,4 +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>
+ <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 cc62c4a..613ae90 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -20,4 +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>
+ <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 6c4b724..41535de 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -20,4 +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>
+ <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 590adbc..2d91762 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"Не удалось загрузить фото"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a9f6616..6d0dff2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,4 +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>
+ <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 816b946..e0b8255 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -20,4 +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>
+ <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 43fb7b1..ebf2059 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"Није могуће учитати слику"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8eef180..70aef72 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -20,4 +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>
+ <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 3253357..22d31e2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -20,4 +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>
+ <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 de409e8..11aed11 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"ไม่สามารถโหลดภาพ"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 40b4a77..f2f43a4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -20,4 +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>
+ <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 0b2b9e6..dfe0b11 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -20,4 +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>
+ <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 77b3c08..da0c3a4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"Зображення не завантажено"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 851d793..c22bbcc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -20,4 +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>
+ <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 65d8b03..51a8856 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"无法加载图片"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fa555d0..5d2d6f0 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"無法載入圖片"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 31aec64..bc1a52c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -20,4 +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>
+ <string name="failed" msgid="1458877219699376279">"Ayikwazanga ukulayisha isithombe"</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b635122..c0c1914 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,4 +19,6 @@
<!-- Photo view sub-title for current photo position [CHAR LIMIT=10] -->
<string name="photo_view_count"><xliff:g id="current_pos">%d</xliff:g> of <xliff:g id="count">%d</xliff:g></string>
<string name="retry">Retry</string>
-</resources>
\ No newline at end of file
+ <!-- Photo view error message shown below thumbnail if full image could not be shown [CHAR LIMIT=30] -->
+ <string name="failed">Couldn\'t load image</string>
+</resources>
diff --git a/src/com/android/ex/photo/fragments/PhotoViewFragment.java b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
index e4807b6..529ed1a 100644
--- a/src/com/android/ex/photo/fragments/PhotoViewFragment.java
+++ b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
@@ -42,6 +42,7 @@
import com.android.ex.photo.R;
import com.android.ex.photo.adapters.PhotoPagerAdapter;
import com.android.ex.photo.loaders.PhotoBitmapLoader;
+import com.android.ex.photo.loaders.PhotoBitmapLoader.BitmapResult;
import com.android.ex.photo.util.ImageUtils;
import com.android.ex.photo.views.PhotoView;
import com.android.ex.photo.views.ProgressBarWrapper;
@@ -50,7 +51,7 @@
* Displays a photo.
*/
public class PhotoViewFragment extends Fragment implements
- LoaderManager.LoaderCallbacks<Bitmap>,
+ LoaderManager.LoaderCallbacks<BitmapResult>,
OnClickListener,
OnScreenListener,
CursorChangedListener {
@@ -281,7 +282,7 @@
}
@Override
- public Loader<Bitmap> onCreateLoader(int id, Bundle args) {
+ public Loader<BitmapResult> onCreateLoader(int id, Bundle args) {
if(mOnlyShowSpinner) {
return null;
}
@@ -296,21 +297,19 @@
}
@Override
- public void onLoadFinished(Loader<Bitmap> loader, Bitmap data) {
+ public void onLoadFinished(Loader<BitmapResult> loader, BitmapResult result) {
+ Bitmap data = result.bitmap;
// If we don't have a view, the fragment has been paused. We'll get the cursor again later.
if (getView() == null) {
return;
}
- // both loaders are started together, they may finish loading in such a
- // way that the thumbnail is displayed on top of the full image
final int id = loader.getId();
switch (id) {
case LOADER_ID_THUMBNAIL:
if (isPhotoBound()) {
// There is need to do anything with the thumbnail
- // image, as the full size
- // image is being shown.
+ // image, as the full size image is being shown.
return;
}
@@ -328,7 +327,14 @@
enableImageTransforms(false);
break;
case LOADER_ID_PHOTO:
- bindPhoto(data);
+
+ if (result.status == BitmapResult.STATUS_EXCEPTION) {
+ mProgressBarNeeded = false;
+ mEmptyText.setText(R.string.failed);
+ mEmptyText.setVisibility(View.VISIBLE);
+ } else {
+ bindPhoto(data);
+ }
break;
default:
break;
@@ -377,7 +383,7 @@
}
@Override
- public void onLoaderReset(Loader<Bitmap> loader) {
+ public void onLoaderReset(Loader<BitmapResult> loader) {
// Do nothing
}
@@ -468,7 +474,7 @@
mCallback.onCursorChanged(this, cursor);
final LoaderManager manager = getLoaderManager();
- final Loader<Bitmap> fakePhotoLoader = manager.getLoader(LOADER_ID_PHOTO);
+ final Loader<BitmapResult> fakePhotoLoader = manager.getLoader(LOADER_ID_PHOTO);
if (fakePhotoLoader != null) {
final PhotoBitmapLoader loader = (PhotoBitmapLoader) fakePhotoLoader;
mResolvedPhotoUri = mAdapter.getPhotoUri(cursor);
@@ -477,7 +483,8 @@
}
if (!mThumbnailShown) {
- final Loader<Bitmap> fakeThumbnailLoader = manager.getLoader(LOADER_ID_THUMBNAIL);
+ final Loader<BitmapResult> fakeThumbnailLoader = manager.getLoader(
+ LOADER_ID_THUMBNAIL);
if (fakeThumbnailLoader != null) {
final PhotoBitmapLoader loader = (PhotoBitmapLoader) fakeThumbnailLoader;
mThumbnailUri = mAdapter.getThumbnailUri(cursor);
diff --git a/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java b/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
index d4d8b60..c29b14f 100644
--- a/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
+++ b/src/com/android/ex/photo/loaders/PhotoBitmapLoader.java
@@ -25,14 +25,14 @@
import android.util.DisplayMetrics;
import com.android.ex.photo.fragments.PhotoViewFragment;
+import com.android.ex.photo.loaders.PhotoBitmapLoader.BitmapResult;
import com.android.ex.photo.util.ImageUtils;
/**
* Loader for the bitmap of a photo.
*/
-public class PhotoBitmapLoader extends AsyncTaskLoader<Bitmap> {
+public class PhotoBitmapLoader extends AsyncTaskLoader<BitmapResult> {
private String mPhotoUri;
-
private Bitmap mBitmap;
public PhotoBitmapLoader(Context context, String photoUri) {
@@ -45,20 +45,26 @@
}
@Override
- public Bitmap loadInBackground() {
+ public BitmapResult loadInBackground() {
+ BitmapResult result = new BitmapResult();
Context context = getContext();
-
if (context != null && mPhotoUri != null) {
final ContentResolver resolver = context.getContentResolver();
- Bitmap bitmap = ImageUtils.createLocalBitmap(resolver, Uri.parse(mPhotoUri),
- PhotoViewFragment.sPhotoSize);
- if (bitmap != null) {
- bitmap.setDensity(DisplayMetrics.DENSITY_MEDIUM);
+ try {
+ Bitmap bitmap = ImageUtils.createLocalBitmap(resolver, Uri.parse(mPhotoUri),
+ PhotoViewFragment.sPhotoSize);
+ if (bitmap != null) {
+ 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;
}
- return bitmap;
}
- return null;
+ return result;
}
/**
@@ -67,7 +73,8 @@
* here just adds a little more logic.
*/
@Override
- public void deliverResult(Bitmap bitmap) {
+ public void deliverResult(BitmapResult result) {
+ Bitmap bitmap = result != null ? result.bitmap : null;
if (isReset()) {
// An async query came in while the loader is stopped. We
// don't need the result.
@@ -81,7 +88,7 @@
if (isStarted()) {
// If the Loader is currently started, we can immediately
// deliver its results.
- super.deliverResult(bitmap);
+ super.deliverResult(result);
}
// At this point we can release the resources associated with
@@ -100,7 +107,10 @@
if (mBitmap != null) {
// If we currently have a result available, deliver it
// immediately.
- deliverResult(mBitmap);
+ BitmapResult result = new BitmapResult();
+ result.status = BitmapResult.STATUS_SUCCESS;
+ result.bitmap = mBitmap;
+ deliverResult(result);
}
if (takeContentChanged() || mBitmap == null) {
@@ -122,12 +132,14 @@
* Handles a request to cancel a load.
*/
@Override
- public void onCanceled(Bitmap bitmap) {
- super.onCanceled(bitmap);
+ public void onCanceled(BitmapResult result) {
+ super.onCanceled(result);
// At this point we can release the resources associated with 'bitmap'
// if needed.
- onReleaseResources(bitmap);
+ if (result != null) {
+ onReleaseResources(result.bitmap);
+ }
}
/**
@@ -157,4 +169,12 @@
bitmap.recycle();
}
}
+
+ public class BitmapResult {
+ public static final int STATUS_SUCCESS = 0;
+ public static final int STATUS_EXCEPTION = 1;
+
+ public Bitmap bitmap;
+ public int status;
+ }
}
diff --git a/src/com/android/ex/photo/util/ImageUtils.java b/src/com/android/ex/photo/util/ImageUtils.java
index 5b1b0d1..9c7189c 100644
--- a/src/com/android/ex/photo/util/ImageUtils.java
+++ b/src/com/android/ex/photo/util/ImageUtils.java
@@ -174,6 +174,12 @@
final Bitmap originalBitmap = BitmapFactory.decodeStream(byteStream, outPadding, opts);
+ if (byteStream != null && originalBitmap == null && !opts.inJustDecodeBounds) {
+ Log.w(TAG, "ImageUtils#decodeStream(InputStream, Rect, Options): "
+ + "Image bytes cannot be decoded into a Bitmap");
+ throw new UnsupportedOperationException(
+ "Image bytes cannot be decoded into a Bitmap.");
+ }
if (originalBitmap != null && orientation != 0) {
final Matrix matrix = new Matrix();
matrix.postRotate(orientation);
