Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG4Pstable/cm-12.1-YOG3C

Android 5.1.0 release 1

79 files changed, 217 insertions, 9 deletions

diff --git a/activity/res/values/themes.xml b/activity/res/values/themes.xml
index 71bea15..1f3108b 100644
--- a/activity/res/values/themes.xml
+++ b/activity/res/values/themes.xml
@@ -26,6 +26,10 @@
         <item name="android:windowBackground">@color/solid_black</item>
         <item name="android:actionBarStyle">@style/Holo.ActionBar</item>
     </style>
+    <style name="PhotoViewTheme.Translucent">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
     <style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar">
         <item name="android:background">@drawable/actionbar_translucent</item>
     </style>
diff --git a/appcompat/res/values/themes.xml b/appcompat/res/values/themes.xml
index 3b6fc68..6fef49c 100644
--- a/appcompat/res/values/themes.xml
+++ b/appcompat/res/values/themes.xml
@@ -25,6 +25,10 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowBackground">@color/solid_black</item>
     </style>
+    <style name="PhotoViewTheme.Translucent">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
     <style name="AppCompat.ActionBar" parent="Widget.AppCompat.ActionBar">
         <item name="background">@drawable/actionbar_translucent</item>
     </style>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b2d43c1..c990256 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 68ea2c4..636c691 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>፣ <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index eadb238..8c37433 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>، <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8bea5fb..4500e68 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>: <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index f1627ad..29c8d9e 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index dd95949..5f43cb4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a34739f..d75c7f0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8dac0d1..c1b190f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bae72a2..fac25ac 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f2e8600..28413eb 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 880c1c3..4217b65 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 880c1c3..4217b65 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c235c3e..da847e5 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 10da26c..af12e91 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index d87b0e2..fe74bd0 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 4151e99..9382c00 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -21,4 +21,5 @@
     <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">"Saiatu berriro"</string>
     <string name="failed" msgid="1458877219699376279">"Ezin izan da irudia kargatu"</string>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9053cfb..adf9620 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>،‏ <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f2a1193..88d78fb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 2e004f0..5ff44b3 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2e004f0..5ff44b3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 5d693c7..d7320da 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -21,4 +21,5 @@
     <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 de novo"</string>
     <string name="failed" msgid="1458877219699376279">"Non se puido cargar a imaxe"</string>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1045724..ae9ba69 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 69af950..f383117 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3434ac7..e142043 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index b111dc9..6f82ee4 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d2a4722..8b3a343 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index aec21e7..5a815e9 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -21,4 +21,5 @@
     <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">"Reyna aftur"</string>
     <string name="failed" msgid="1458877219699376279">"Ekki var hægt að hlaða mynd"</string>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a2d9416..ae5b941 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d85d629..c9a2d1d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5f77114..9b059f1 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>（<xliff:g id="SUBTITLE">%s</xliff:g>）"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index cb278b3..852d538 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index a4f6589..95a85bb 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 3129bd0..b05bb9e 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 8d16071..2129ad1 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ef89a68..3ef7ed0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index ca2e5a1..6977866 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 50d0809..b5788b3 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c1a5687..708d104 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 40e188d..983a3fd 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 01e0a9b..a4e1018 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 1136169..e5eb7f7 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 4e49795..fb6073b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 2e3826b..7574256 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index fa1c78c..7727211 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index a897a17..c195af2 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d5be2e8..bf34b54 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 8259836..f3635d4 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c4e7ac6..83032b9 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9160a47..05ce163 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index cd7e6e6..da94278 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 613ae90..6c05393 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 41535de..0fa2d48 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2d91762..7a9e6f7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index cc96fd0..ac244ea 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>,<xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6d0dff2..e2a5327 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e0b8255..f64f4db 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index ebf2059..d6ceb4f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 70aef72..0d813b7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 22d31e2..2e19c7d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index db2c8f5..393169c 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 1cbccf1..8e5e0f9 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 11aed11..6388016 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g> <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f2f43a4..499c47b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index dfe0b11..5e76d1a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index da0c3a4..db7741b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index b2e43f2..8635edf 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>، <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 05cf043..785f8ef 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -21,4 +21,5 @@
     <string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="COUNT">%d</xliff:g> tadan <xliff:g id="CURRENT_POS">%d</xliff:g>si"</string>
     <string name="retry" msgid="3319517143224679074">"Qayta urinish"</string>
     <string name="failed" msgid="1458877219699376279">"Tasvir yuklanmadi"</string>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c22bbcc..40b3f9f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 51a8856..e2e0b78 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>，<xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9846e88..18845bb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>，<xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5d2d6f0..c828bab 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>，<xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index bc1a52c..489b9a4 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -21,4 +21,5 @@
     <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>
+    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c0c1914..eb4896a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,4 +21,6 @@
     <string name="retry">Retry</string>
     <!-- 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>
+    <!-- Title and subtitle combined into a single string -->
+    <string name="titles"><xliff:g id="title">%s</xliff:g>, <xliff:g id="subtitle">%s</xliff:g></string>
 </resources>
diff --git a/src/com/android/ex/photo/Intents.java b/src/com/android/ex/photo/Intents.java
index 99c3059..a1e9ffa 100644
--- a/src/com/android/ex/photo/Intents.java
+++ b/src/com/android/ex/photo/Intents.java
@@ -261,7 +261,17 @@ public class Intents {
         public Intent build() {
             mIntent.setAction(Intent.ACTION_VIEW);
 
-            mIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            // In Lollipop, each list of photos should appear as a document in the "Recents"
+            // list. In earlier versions, this flag was Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET.
+            mIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT
+                    // FLAG_ACTIVITY_CLEAR_TOP is needed for the case where the app tries to
+                    // display a different photo while there is an existing activity instance
+                    // for that list of photos. Since the initial photo is specified as an
+                    // extra, without FLAG_ACTIVITY_CLEAR_TOP, the activity instance would
+                    // just get restarted and it would display whatever photo it was last
+                    // displaying. FLAG_ACTIVITY_CLEAR_TOP causes a new instance to be created,
+                    // and it will display the new initial photo.
+                    | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
             if (mPhotoIndex != null) {
                 mIntent.putExtra(EXTRA_PHOTO_INDEX, (int) mPhotoIndex);
diff --git a/src/com/android/ex/photo/PhotoViewController.java b/src/com/android/ex/photo/PhotoViewController.java
index eccb225..fac1478 100644
--- a/src/com/android/ex/photo/PhotoViewController.java
+++ b/src/com/android/ex/photo/PhotoViewController.java
@@ -26,6 +26,7 @@ import android.view.View;
 import android.view.ViewPropertyAnimator;
 import android.view.WindowManager;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+import android.view.accessibility.AccessibilityManager;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.view.animation.Animation.AnimationListener;
@@ -44,6 +45,7 @@ import com.android.ex.photo.loaders.PhotoBitmapLoaderInterface.BitmapResult;
 import com.android.ex.photo.loaders.PhotoPagerLoader;
 import com.android.ex.photo.provider.PhotoContract;
 import com.android.ex.photo.util.ImageUtils;
+import com.android.ex.photo.util.Util;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -87,6 +89,8 @@ public class PhotoViewController implements
 
     private final static String TAG = "PhotoViewController";
 
+    private final static String STATE_INITIAL_URI_KEY =
+            "com.android.ex.PhotoViewFragment.INITIAL_URI";
     private final static String STATE_CURRENT_URI_KEY =
             "com.android.ex.PhotoViewFragment.CURRENT_URI";
     private final static String STATE_CURRENT_INDEX_KEY =
@@ -124,6 +128,8 @@ public class PhotoViewController implements
 
     /** The URI of the photos we're viewing; may be {@code null} */
     private String mPhotosUri;
+    /** The uri of the initial photo */
+    private String mInitialPhotoUri;
     /** The index of the currently viewed photo */
     private int mCurrentPhotoIndex;
     /** The uri of the currently viewed photo */
@@ -176,6 +182,8 @@ public class PhotoViewController implements
     protected boolean mActionBarHiddenInitially;
     protected boolean mDisplayThumbsFullScreen;
 
+    private final AccessibilityManager mAccessibilityManager;
+
     protected BitmapCallback mBitmapCallback;
     protected final Handler mHandler = new Handler();
 
@@ -204,6 +212,9 @@ public class PhotoViewController implements
                 }
             };
         }
+
+        mAccessibilityManager = (AccessibilityManager)
+                activity.getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
     }
 
     public PhotoPagerAdapter createPhotoPagerAdapter(Context context,
@@ -234,7 +245,8 @@ public class PhotoViewController implements
             mAnimationStartHeight = intent.getIntExtra(Intents.EXTRA_ANIMATION_START_HEIGHT, 0);
         }
         mActionBarHiddenInitially = intent.getBooleanExtra(
-                Intents.EXTRA_ACTION_BAR_HIDDEN_INITIALLY, false);
+                Intents.EXTRA_ACTION_BAR_HIDDEN_INITIALLY, false)
+                && !Util.isTouchExplorationEnabled(mAccessibilityManager);
         mDisplayThumbsFullScreen = intent.getBooleanExtra(
                 Intents.EXTRA_DISPLAY_THUMBS_FULLSCREEN, false);
 
@@ -261,14 +273,17 @@ public class PhotoViewController implements
             mCurrentPhotoIndex = intent.getIntExtra(Intents.EXTRA_PHOTO_INDEX, -1);
         }
         if (intent.hasExtra(Intents.EXTRA_INITIAL_PHOTO_URI)) {
-            mCurrentPhotoUri = intent.getStringExtra(Intents.EXTRA_INITIAL_PHOTO_URI);
+            mInitialPhotoUri = intent.getStringExtra(Intents.EXTRA_INITIAL_PHOTO_URI);
+            mCurrentPhotoUri = mInitialPhotoUri;
         }
         mIsEmpty = true;
 
         if (savedInstanceState != null) {
+            mInitialPhotoUri = savedInstanceState.getString(STATE_INITIAL_URI_KEY);
             mCurrentPhotoUri = savedInstanceState.getString(STATE_CURRENT_URI_KEY);
             mCurrentPhotoIndex = savedInstanceState.getInt(STATE_CURRENT_INDEX_KEY);
-            mFullScreen = savedInstanceState.getBoolean(STATE_FULLSCREEN_KEY, false);
+            mFullScreen = savedInstanceState.getBoolean(STATE_FULLSCREEN_KEY, false)
+                    && !Util.isTouchExplorationEnabled(mAccessibilityManager);
             mActionBarTitle = savedInstanceState.getString(STATE_ACTIONBARTITLE_KEY);
             mActionBarSubtitle = savedInstanceState.getString(STATE_ACTIONBARSUBTITLE_KEY);
             mEnterAnimationFinished = savedInstanceState.getBoolean(
@@ -310,7 +325,7 @@ public class PhotoViewController implements
             // make our temporary image invisible and display the ViewPager.
             mViewPager.setVisibility(View.GONE);
             Bundle args = new Bundle();
-            args.putString(ARG_IMAGE_URI, mCurrentPhotoUri);
+            args.putString(ARG_IMAGE_URI, mInitialPhotoUri);
             mActivity.getSupportLoaderManager().initLoader(
                     BITMAP_LOADER_THUMBNAIL, args, mBitmapCallback);
         }
@@ -416,6 +431,7 @@ public class PhotoViewController implements
     }
 
     public void onSaveInstanceState(Bundle outState) {
+        outState.putString(STATE_INITIAL_URI_KEY, mInitialPhotoUri);
         outState.putString(STATE_CURRENT_URI_KEY, mCurrentPhotoUri);
         outState.putInt(STATE_CURRENT_INDEX_KEY, mCurrentPhotoIndex);
         outState.putBoolean(STATE_FULLSCREEN_KEY, mFullScreen);
@@ -661,6 +677,13 @@ public class PhotoViewController implements
      * Updates the title bar according to the value of {@link #mFullScreen}.
      */
     protected void setFullScreen(boolean fullScreen, boolean setDelayedRunnable) {
+        if (Util.isTouchExplorationEnabled(mAccessibilityManager)) {
+            // Disallow full screen mode when accessibility is enabled so that the action bar
+            // stays accessible.
+            fullScreen = false;
+            setDelayedRunnable = false;
+        }
+
         final boolean fullScreenChanged = (fullScreen != mFullScreen);
         mFullScreen = fullScreen;
 
@@ -714,6 +737,12 @@ public class PhotoViewController implements
         int uriIndex = cursor.getColumnIndex(PhotoContract.PhotoViewColumns.URI);
         mCurrentPhotoUri = cursor.getString(uriIndex);
         updateActionBar();
+        if (mAccessibilityManager.isEnabled()) {
+            String announcement = getPhotoAccessibilityAnnouncement(position);
+            if (announcement != null) {
+                Util.announceForAccessibility(mRootView, mAccessibilityManager, announcement);
+            }
+        }
 
         // Restart the timer to return to fullscreen.
         cancelEnterFullScreenRunnable();
@@ -748,6 +777,21 @@ public class PhotoViewController implements
     }
 
     /**
+     * Returns a string used as an announcement for accessibility after the user moves to a new
+     * photo. It will be called after {@link #updateActionBar} has been called.
+     * @param position the index in the album of the currently active photo
+     * @return announcement for accessibility
+     */
+    protected String getPhotoAccessibilityAnnouncement(int position) {
+        String announcement = mActionBarTitle;
+        if (mActionBarSubtitle != null) {
+            announcement = mActivity.getContext().getResources().getString(
+                    R.string.titles, mActionBarTitle, mActionBarSubtitle);
+        }
+        return announcement;
+    }
+
+    /**
      * Sets the Action Bar title to {@link #mActionBarTitle} and the subtitle to
      * {@link #mActionBarSubtitle}
      */
@@ -833,6 +877,8 @@ public class PhotoViewController implements
                 mTemporaryImage.setVisibility(View.GONE);
                 mViewPager.setVisibility(View.VISIBLE);
             }
+            mActivity.getSupportLoaderManager().destroyLoader(
+                    PhotoViewCallbacks.BITMAP_LOADER_THUMBNAIL);
         }
     }
 
@@ -988,6 +1034,11 @@ public class PhotoViewController implements
                     .translationX(translateX).translationY(translateY)
                     .setDuration(EXIT_ANIMATION_DURATION_MS);
             }
+            // If the user has swiped to a different photo, fade out the current photo
+            // along with the scale animation.
+            if (!mInitialPhotoUri.equals(mCurrentPhotoUri)) {
+                animator.alpha(0f);
+            }
             if (version >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
                 animator.withEndAction(endRunnable);
             } else {
@@ -1134,10 +1185,6 @@ public class PhotoViewController implements
                     // We just loaded the initial thumbnail that we can display
                     // while waiting for the full viewPager to get initialized.
                     initTemporaryImage(drawable);
-                    // Destroy the loader so we don't attempt to load the thumbnail
-                    // again on screen rotations.
-                    mActivity.getSupportLoaderManager().destroyLoader(
-                            PhotoViewCallbacks.BITMAP_LOADER_THUMBNAIL);
                     break;
                 case PhotoViewCallbacks.BITMAP_LOADER_AVATAR:
                     if (drawable == null) {
diff --git a/src/com/android/ex/photo/fragments/PhotoViewFragment.java b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
index aa3099a..a943a60 100644
--- a/src/com/android/ex/photo/fragments/PhotoViewFragment.java
+++ b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
@@ -399,6 +399,7 @@ public class PhotoViewFragment extends Fragment implements
             mEmptyText.setVisibility(View.VISIBLE);
             mCallback.onFragmentPhotoLoadComplete(this, false /* success */);
         } else {
+            mEmptyText.setVisibility(View.GONE);
             final Drawable data = result.getDrawable(getResources());
             bindPhoto(data);
             mCallback.onFragmentPhotoLoadComplete(this, true /* success */);
diff --git a/src/com/android/ex/photo/util/Util.java b/src/com/android/ex/photo/util/Util.java
new file mode 100644
index 0000000..13f17ec
--- /dev/null
+++ b/src/com/android/ex/photo/util/Util.java
@@ -0,0 +1,68 @@
+package com.android.ex.photo.util;
+
+import android.content.Context;
+import android.os.Build;
+import android.support.v4.view.accessibility.AccessibilityEventCompat;
+import android.support.v4.view.accessibility.AccessibilityRecordCompat;
+import android.view.View;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+
+public class Util {
+    public static boolean isTouchExplorationEnabled(AccessibilityManager accessibilityManager) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            return accessibilityManager.isTouchExplorationEnabled();
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Make an announcement which is related to some sort of a context change. Also see
+     * {@link android.view.View#announceForAccessibility}
+     * @param view The view that triggered the announcement
+     * @param accessibilityManager AccessibilityManager instance. If it is null, the method can
+     *          obtain an instance itself.
+     * @param text The announcement text
+     */
+    public static void announceForAccessibility(
+            final View view, AccessibilityManager accessibilityManager,
+            final CharSequence text) {
+        // Jelly Bean added support for speaking text verbatim
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            view.announceForAccessibility(text);
+            return;
+        }
+
+        final Context context = view.getContext().getApplicationContext();
+        if (accessibilityManager == null) {
+            accessibilityManager = (AccessibilityManager) context.getSystemService(
+                    Context.ACCESSIBILITY_SERVICE);
+        }
+
+        if (!accessibilityManager.isEnabled()) {
+            return;
+        }
+
+        final int eventType = AccessibilityEvent.TYPE_VIEW_FOCUSED;
+
+        // Construct an accessibility event with the minimum recommended
+        // attributes. An event without a class name or package may be dropped.
+        final AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
+        event.getText().add(text);
+        event.setEnabled(view.isEnabled());
+        event.setClassName(view.getClass().getName());
+        event.setPackageName(context.getPackageName());
+
+        // JellyBean MR1 requires a source view to set the window ID.
+        final AccessibilityRecordCompat record = AccessibilityEventCompat.asRecord(event);
+        record.setSource(view);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            view.getParent().requestSendAccessibilityEvent(view, event);
+        } else {
+            // Sends the event directly through the accessibility manager.
+            accessibilityManager.sendAccessibilityEvent(event);
+        }
+    }
+}