diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 16:06:13 +0000 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 16:06:13 +0000 |
commit | d6a3f5505c4b9872669c6c23c3834ce52939f9fe (patch) | |
tree | 2634b85770fc98df38165c40e3d3f11e4bf7f65a | |
parent | 412c2e04636a24e7da24bb26b751b9482a83d68f (diff) | |
parent | 858f66591e329ffab0a2f6aa85984233b38eee87 (diff) | |
download | android_packages_screensavers_PhotoTable-d6a3f5505c4b9872669c6c23c3834ce52939f9fe.tar.gz android_packages_screensavers_PhotoTable-d6a3f5505c4b9872669c6c23c3834ce52939f9fe.tar.bz2 android_packages_screensavers_PhotoTable-d6a3f5505c4b9872669c6c23c3834ce52939f9fe.zip |
Merge tag 'android-4.4_r1' into cm-11.0
Android 4.4 Release 1.0
80 files changed, 868 insertions, 118 deletions
diff --git a/res/layout-sw800dp/table.xml b/res/layout-sw800dp/table.xml index e063cd5..c40ee48 100644 --- a/res/layout-sw800dp/table.xml +++ b/res/layout-sw800dp/table.xml @@ -23,6 +23,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" > + <View + android:id="@+id/scrim" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@+drawable/table" + android:alpha="0" + android:visibility="gone" + /> + <FrameLayout android:id="@+id/stageleft" android:layout_width="match_parent" diff --git a/res/layout/table.xml b/res/layout/table.xml index 7cdb51a..10622f5 100644 --- a/res/layout/table.xml +++ b/res/layout/table.xml @@ -26,6 +26,15 @@ android:background="@+drawable/table" android:focusable="true" > + <View + android:id="@+id/scrim" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@+drawable/table" + android:alpha="0" + android:visibility="gone" + /> + <FrameLayout android:id="@+id/stageleft" android:layout_width="match_parent" diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index d0be698..88a2a29 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Fototabel"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fotoraam"</string> <string name="posts_album_name" msgid="5628151551239729515">"Foto\'s uit plasings"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Kitsoplaaisels"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Naamlose album"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Voorraadfoto\'s"</string> <string name="local_source_name" msgid="6487253091085518505">"Foto\'s op die toestel"</string> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 5a07a36..01ac8d7 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"የፎቶ ሠንጠረዥ"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"የፎቶ ክፈፍ"</string> <string name="posts_album_name" msgid="5628151551239729515">"ፎቶዎች ከልጥፎች"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"ፈጣን ሰቀላዎች"</string> <string name="unknown_album_name" msgid="2135521368192091267">"ያልተሰየመ አልበም"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"የክምችት ፎቶዎች"</string> <string name="local_source_name" msgid="6487253091085518505">"በመሣሪያ ላይ ያሉ መሣሪያዎች"</string> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 8c15d8c..abf6ed2 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"جدول الصور"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"إطار الصورة"</string> <string name="posts_album_name" msgid="5628151551239729515">"صور من المشاركات"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"التحميلات الفورية"</string> <string name="unknown_album_name" msgid="2135521368192091267">"ألبوم بلا اسم"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"صور المخزون"</string> <string name="local_source_name" msgid="6487253091085518505">"الصور على الجهاز"</string> diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml new file mode 100644 index 0000000..6b1d70a --- /dev/null +++ b/res/values-az-rAZ/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"Foto Ekran qoruyucuları"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"Foto Stol"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"Foto Çərçivə"</string> + <string name="posts_album_name" msgid="5628151551239729515">"Yazılardan Fotolar"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"Adsız Albom"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"Ehtiyat Fotolar"</string> + <string name="local_source_name" msgid="6487253091085518505">"Cihazda Fotolar"</string> + <string name="need_to_configure" msgid="1269102638159389032">"Heç bir fotoşəkil seçilməyib."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"Hamısını Seçin"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"Hamısından seçimi qaldırın"</string> + <string name="no_photos" msgid="4262083523147564199">"Cihazda fotoşəkil yoxdur."</string> +</resources> diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml new file mode 100644 index 0000000..6b1d70a --- /dev/null +++ b/res/values-az/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"Foto Ekran qoruyucuları"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"Foto Stol"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"Foto Çərçivə"</string> + <string name="posts_album_name" msgid="5628151551239729515">"Yazılardan Fotolar"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"Adsız Albom"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"Ehtiyat Fotolar"</string> + <string name="local_source_name" msgid="6487253091085518505">"Cihazda Fotolar"</string> + <string name="need_to_configure" msgid="1269102638159389032">"Heç bir fotoşəkil seçilməyib."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"Hamısını Seçin"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"Hamısından seçimi qaldırın"</string> + <string name="no_photos" msgid="4262083523147564199">"Cihazda fotoşəkil yoxdur."</string> +</resources> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 45a7a41..7557918 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Фотатабліца"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Рамка фота"</string> <string name="posts_album_name" msgid="5628151551239729515">"Фота з апублiкаваных паведамленняў"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Аўтаматычная запампоўка"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Безыменны альбом"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Захаваныя фотаздымкi"</string> <string name="local_source_name" msgid="6487253091085518505">"Фота на прыладзе"</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 0097b4d..c33ab39 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Таблица със снимки"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Рамка за снимки"</string> <string name="posts_album_name" msgid="5628151551239729515">"Снимки от публикации"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Незабавно качени"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Неозаглавен албум"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Стокови снимки"</string> <string name="local_source_name" msgid="6487253091085518505">"Снимки на устройството"</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index ce1ba91..c191343 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Taula de fotos"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Marc de fotos"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotos de publicacions"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Pujades instantànies"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Àlbum sense nom"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotos en estoc"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotos del dispositiu"</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index a52ae07..e2c118c 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Foto pult"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Foto rámeček"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotky z příspěvků"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Okamžité nahrávání"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album bez názvu"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotky z fotobanky"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotky v zařízení"</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index e7a96cb..9795e5c 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Fotobord"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fotoramme"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotos fra indlæg"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Øjeblikkelige uploads"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Unavngivet album"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Arkivfotos"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotos på enheden"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 0d41eb2..bed61a3 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Fototafel"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fotorahmen"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotos aus Beiträgen"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Sofort-Uploads"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Unbenanntes Album"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Stockfotos"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotos auf Gerät"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 22dc407..1677f24 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Πίνακας φωτογραφιών"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Πλαίσιο φωτογραφίας"</string> <string name="posts_album_name" msgid="5628151551239729515">"Φωτογραφίες από αναρτήσεις"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Άμεσες μεταφορτώσεις"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Λεύκωμα χωρίς όνομα"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Φωτογραφίες στοκ"</string> <string name="local_source_name" msgid="6487253091085518505">"Φωτογραφίες στη συσκευή"</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 0ea488f..6e661d9 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Photo Table"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Photo Frame"</string> <string name="posts_album_name" msgid="5628151551239729515">"Photos From Posts"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Instant Uploads"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Unnamed Album"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Stock photos"</string> <string name="local_source_name" msgid="6487253091085518505">"Photos on Device"</string> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml new file mode 100644 index 0000000..6e661d9 --- /dev/null +++ b/res/values-en-rIN/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"Photo Screensavers"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"Photo Table"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"Photo Frame"</string> + <string name="posts_album_name" msgid="5628151551239729515">"Photos From Posts"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"Unnamed Album"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"Stock photos"</string> + <string name="local_source_name" msgid="6487253091085518505">"Photos on Device"</string> + <string name="need_to_configure" msgid="1269102638159389032">"No photos selected."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"Select All"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"Deselect All"</string> + <string name="no_photos" msgid="4262083523147564199">"No photos on the device."</string> +</resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index e202b79..84444dc 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Tabla de fotos"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Marco de fotos"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotos de publicaciones"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Cargas instantáneas"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Álbum sin nombre"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotos en stock"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotos en el dispositivo"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 7d17cd1..48d5135 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Tabla de fotos"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Marco de fotos"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotos de publicaciones"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Subidas instantáneas"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Álbum sin nombre"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotos de archivo"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotos del dispositivo"</string> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml new file mode 100644 index 0000000..08485db --- /dev/null +++ b/res/values-et-rEE/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"Fotodega ekraanisäästjad"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"Fototabel"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fotoraam"</string> + <string name="posts_album_name" msgid="5628151551239729515">"Postituste fotod"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"Pealkirjata album"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotovaramu"</string> + <string name="local_source_name" msgid="6487253091085518505">"Seadmesse salvestatud fotod"</string> + <string name="need_to_configure" msgid="1269102638159389032">"Valitud ei ole ühtegi fotot."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"Vali kõik"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"Tühista kõik valikud"</string> + <string name="no_photos" msgid="4262083523147564199">"Seadmes ei ole fotosid."</string> +</resources> diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 2a0c3d1..08485db 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Fototabel"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fotoraam"</string> <string name="posts_album_name" msgid="5628151551239729515">"Postituste fotod"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Automaatne üleslaadimine"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Pealkirjata album"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotovaramu"</string> <string name="local_source_name" msgid="6487253091085518505">"Seadmesse salvestatud fotod"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 0d3c9e0..fe58f3e 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"جدول عکس"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"قاب عکس"</string> <string name="posts_album_name" msgid="5628151551239729515">"عکسهایی از پستها"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"آپلودهای فوری"</string> <string name="unknown_album_name" msgid="2135521368192091267">"آلبوم بدون نام"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"عکسهای موجود"</string> <string name="local_source_name" msgid="6487253091085518505">"عکسهای موجود در دستگاه"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 640cc1b..ef63a7e 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Kuvataulukko"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Valokuvakehys"</string> <string name="posts_album_name" msgid="5628151551239729515">"Kuvat viesteistä"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Pikalataukset"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Nimetön albumi"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Varastossa olevat kuvat"</string> <string name="local_source_name" msgid="6487253091085518505">"Kuvat laitteella"</string> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml new file mode 100644 index 0000000..e5b7e42 --- /dev/null +++ b/res/values-fr-rCA/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"Écrans de veille photos"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"Tableau Photo WL: 90"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"Cadre Photo WL: 90"</string> + <string name="posts_album_name" msgid="5628151551239729515">"Photos des messages"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"Album sans nom"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"Banque de photos"</string> + <string name="local_source_name" msgid="6487253091085518505">"Photos de l\'appareil"</string> + <string name="need_to_configure" msgid="1269102638159389032">"Aucune photo sélectionnée."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"Tout sélectionner"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"Tout désélectionner"</string> + <string name="no_photos" msgid="4262083523147564199">"Aucune photo sur l\'appareil"</string> +</resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 5f79ad2..e1bb689 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Tableau photo"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Cadre photo"</string> <string name="posts_album_name" msgid="5628151551239729515">"Photos des messages"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Importations Instant Upload"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album sans nom"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Banque de photos"</string> <string name="local_source_name" msgid="6487253091085518505">"Photos de l\'appareil"</string> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 40eaad2..0015e10 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"फ़ोटो टेबल"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"फ़ोटो फ़्रेम"</string> <string name="posts_album_name" msgid="5628151551239729515">"पोस्ट से फ़ोटो"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"तत्काल अपलोड"</string> <string name="unknown_album_name" msgid="2135521368192091267">"अनाम एल्बम"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"स्टॉक फ़ोटो"</string> <string name="local_source_name" msgid="6487253091085518505">"उपकरण पर फ़ोटो"</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index bb62c42..af27ff8 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Tablica fotografija"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Okvir fotografije"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotografije iz postova"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Automatska slanja"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Neimenovani album"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Arhivske fotografije"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotografije na uređaju"</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 2d3855f..7b06014 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Fotótáblázat"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fényképkeret"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotók bejegyzésekből"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Azonnali feltöltések"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Név nélküli album"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotótárfotók"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotók az eszközön"</string> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml new file mode 100644 index 0000000..c6e052e --- /dev/null +++ b/res/values-hy-rAM/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"Լուսանկարներով էկրանապահներ"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"Լուսանկարների աղյուսակ"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"Լուսանկարի շրջանակ"</string> + <string name="posts_album_name" msgid="5628151551239729515">"Փակցվածքի լուսանկարները"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"Անանուն ալբոմ"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"Հեղինակային լուսանկարներ"</string> + <string name="local_source_name" msgid="6487253091085518505">"Սարքի լուսանկարները"</string> + <string name="need_to_configure" msgid="1269102638159389032">"Ըտրված լուսանկարներ չկան:"</string> + <string name="photodream_select_all" msgid="6364858563337927827">"Ընտրել բոլորը"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"Ապընտրել բոլորը"</string> + <string name="no_photos" msgid="4262083523147564199">"Սարքի վրա լուսանկարներ չկան:"</string> +</resources> diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml new file mode 100644 index 0000000..c6e052e --- /dev/null +++ b/res/values-hy/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"Լուսանկարներով էկրանապահներ"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"Լուսանկարների աղյուսակ"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"Լուսանկարի շրջանակ"</string> + <string name="posts_album_name" msgid="5628151551239729515">"Փակցվածքի լուսանկարները"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"Անանուն ալբոմ"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"Հեղինակային լուսանկարներ"</string> + <string name="local_source_name" msgid="6487253091085518505">"Սարքի լուսանկարները"</string> + <string name="need_to_configure" msgid="1269102638159389032">"Ըտրված լուսանկարներ չկան:"</string> + <string name="photodream_select_all" msgid="6364858563337927827">"Ընտրել բոլորը"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"Ապընտրել բոլորը"</string> + <string name="no_photos" msgid="4262083523147564199">"Սարքի վրա լուսանկարներ չկան:"</string> +</resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 758e830..fbcc06f 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Tabel Foto"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Bingkai Foto"</string> <string name="posts_album_name" msgid="5628151551239729515">"Foto dari Pos"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Upload Instan"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album Tanpa Nama"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Foto Stok"</string> <string name="local_source_name" msgid="6487253091085518505">"Foto di Perangkat"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index fd50f8c..900b487 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Tabella foto"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Cornice foto"</string> <string name="posts_album_name" msgid="5628151551239729515">"Foto dai post"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Caricamenti istantanei"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album senza nome"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Foto di archivi stock"</string> <string name="local_source_name" msgid="6487253091085518505">"Foto su dispositivo"</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 49b9c4f..be08eee 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"טבלת תמונות"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"מסגרת תמונה"</string> <string name="posts_album_name" msgid="5628151551239729515">"תמונות מפוסטים"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"העלאות מיידיות"</string> <string name="unknown_album_name" msgid="2135521368192091267">"אלבום ללא שם"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"תמונות במלאי"</string> <string name="local_source_name" msgid="6487253091085518505">"תמונות במכשיר"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 722faa9..1c54c40 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"フォトテーブル"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"フォトフレーム"</string> <string name="posts_album_name" msgid="5628151551239729515">"投稿からの画像"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"インスタントアップロード"</string> <string name="unknown_album_name" msgid="2135521368192091267">"無題のアルバム"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"ストックフォト"</string> <string name="local_source_name" msgid="6487253091085518505">"端末上の画像"</string> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml new file mode 100644 index 0000000..69ea76f --- /dev/null +++ b/res/values-ka-rGE/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"ფოტო ეკრანმზოგები"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"ფოტო კოლაჟი"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"ჩარჩო"</string> + <string name="posts_album_name" msgid="5628151551239729515">"ფოტოები პოსტებიდან"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"უსახელო ალმობი"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"არქივის ფოტოები"</string> + <string name="local_source_name" msgid="6487253091085518505">"მოწყობილობის ფოტოები"</string> + <string name="need_to_configure" msgid="1269102638159389032">"ფოტოები არ არის მონიშნული."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"ყველას არჩევა"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"ყველა მონიშვნის მოხსნა"</string> + <string name="no_photos" msgid="4262083523147564199">"მოწყობილობაზე ფოტოები არ არის."</string> +</resources> diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml new file mode 100644 index 0000000..69ea76f --- /dev/null +++ b/res/values-ka/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"ფოტო ეკრანმზოგები"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"ფოტო კოლაჟი"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"ჩარჩო"</string> + <string name="posts_album_name" msgid="5628151551239729515">"ფოტოები პოსტებიდან"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"უსახელო ალმობი"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"არქივის ფოტოები"</string> + <string name="local_source_name" msgid="6487253091085518505">"მოწყობილობის ფოტოები"</string> + <string name="need_to_configure" msgid="1269102638159389032">"ფოტოები არ არის მონიშნული."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"ყველას არჩევა"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"ყველა მონიშვნის მოხსნა"</string> + <string name="no_photos" msgid="4262083523147564199">"მოწყობილობაზე ფოტოები არ არის."</string> +</resources> diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml new file mode 100644 index 0000000..f0f2b75 --- /dev/null +++ b/res/values-km-rKH/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"ធាតុរក្សាអេក្រង់ជារូបថត"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"តារាងរូបថត"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"ស៊ុមរូបថត"</string> + <string name="posts_album_name" msgid="5628151551239729515">"រូបថតពីការប្រកាស"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"អាល់ប៊ុមគ្មានឈ្មោះ"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"កន្លែងផ្ទុករូបថត"</string> + <string name="local_source_name" msgid="6487253091085518505">"រូបថតលើឧបករណ៍"</string> + <string name="need_to_configure" msgid="1269102638159389032">"គ្មានរូបថតបានជ្រើស។"</string> + <string name="photodream_select_all" msgid="6364858563337927827">"ជ្រើសទាំងអស់"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"មិនជ្រើសទាំងអស់"</string> + <string name="no_photos" msgid="4262083523147564199">"គ្មានរូបថតលើឧបករណ៍។"</string> +</resources> diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml new file mode 100644 index 0000000..f0f2b75 --- /dev/null +++ b/res/values-km/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"ធាតុរក្សាអេក្រង់ជារូបថត"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"តារាងរូបថត"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"ស៊ុមរូបថត"</string> + <string name="posts_album_name" msgid="5628151551239729515">"រូបថតពីការប្រកាស"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"អាល់ប៊ុមគ្មានឈ្មោះ"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"កន្លែងផ្ទុករូបថត"</string> + <string name="local_source_name" msgid="6487253091085518505">"រូបថតលើឧបករណ៍"</string> + <string name="need_to_configure" msgid="1269102638159389032">"គ្មានរូបថតបានជ្រើស។"</string> + <string name="photodream_select_all" msgid="6364858563337927827">"ជ្រើសទាំងអស់"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"មិនជ្រើសទាំងអស់"</string> + <string name="no_photos" msgid="4262083523147564199">"គ្មានរូបថតលើឧបករណ៍។"</string> +</resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 29b8aef..c0eb42e 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"사진 표"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"사진 프레임"</string> <string name="posts_album_name" msgid="5628151551239729515">"소식에 있는 사진"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"자동 업로드"</string> <string name="unknown_album_name" msgid="2135521368192091267">"이름을 지정하지 않은 앨범"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"스톡 사진"</string> <string name="local_source_name" msgid="6487253091085518505">"기기에 저장된 사진"</string> diff --git a/res/values-land-notouch/config.xml b/res/values-land-notouch/config.xml index d125dd1..5e088e4 100644 --- a/res/values-land-notouch/config.xml +++ b/res/values-land-notouch/config.xml @@ -27,4 +27,6 @@ <!-- Duration in milliseconds for the pickup animation. --> <integer name="photo_pickup_duration">1500</integer> + <!-- Enable hardware layer optimization (interferes with dragging). --> + <bool name="enable_background_optimization">true</bool> </resources>
\ No newline at end of file diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml new file mode 100644 index 0000000..1d2c794 --- /dev/null +++ b/res/values-lo-rLA/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"ຮູບພາບສະກຣີນເຊບເວີ"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"ຕາຕາລາງຮູບ"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"ຂອບຮູບ"</string> + <string name="posts_album_name" msgid="5628151551239729515">"ຮູບພາບຈາກໂພສຕ່າງໆ"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"ອະລະບ້ຳບໍ່ມີຊື່"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"ຮູບຖ່າຍສະຕັອກ"</string> + <string name="local_source_name" msgid="6487253091085518505">"ຮູບພາບໃນອຸປະກອນ"</string> + <string name="need_to_configure" msgid="1269102638159389032">"ບໍ່ໄດ້ເລືອກຮູບເທື່ອ."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"ເລືອກທັງຫມົດ"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"ບໍ່ເລືອກທັງໝົດ"</string> + <string name="no_photos" msgid="4262083523147564199">"ບໍ່ມີຮູບໃນອຸປະກອນນີ້."</string> +</resources> diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml new file mode 100644 index 0000000..1d2c794 --- /dev/null +++ b/res/values-lo/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"ຮູບພາບສະກຣີນເຊບເວີ"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"ຕາຕາລາງຮູບ"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"ຂອບຮູບ"</string> + <string name="posts_album_name" msgid="5628151551239729515">"ຮູບພາບຈາກໂພສຕ່າງໆ"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"ອະລະບ້ຳບໍ່ມີຊື່"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"ຮູບຖ່າຍສະຕັອກ"</string> + <string name="local_source_name" msgid="6487253091085518505">"ຮູບພາບໃນອຸປະກອນ"</string> + <string name="need_to_configure" msgid="1269102638159389032">"ບໍ່ໄດ້ເລືອກຮູບເທື່ອ."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"ເລືອກທັງຫມົດ"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"ບໍ່ເລືອກທັງໝົດ"</string> + <string name="no_photos" msgid="4262083523147564199">"ບໍ່ມີຮູບໃນອຸປະກອນນີ້."</string> +</resources> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index f24ba05..1cd1ecb 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Nuotraukų lentelė"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Nuotraukų rėmelis"</string> <string name="posts_album_name" msgid="5628151551239729515">"Įrašų nuotraukos"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Momentiniai įkėlimai"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Albumas be pavadinimo"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Šabloninės nuotraukos"</string> <string name="local_source_name" msgid="6487253091085518505">"Nuotraukos įrenginyje"</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index dd3a161..8640a54 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Fotoattēlu tabula"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fotoattēla ietvars"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotoattēli no ziņām"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Tūlītējas augšupielādes"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Albums bez nosaukuma"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Krājuma fotoattēli"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotoattēli ierīcē"</string> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml new file mode 100644 index 0000000..bfb59f1 --- /dev/null +++ b/res/values-mn-rMN/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"Фото дэлгэц хамгаалагч"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"Фото хүснэгт"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"Зургийн Жааз"</string> + <string name="posts_album_name" msgid="5628151551239729515">"Нийтлэлийн зургууд"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"Нэрлэгдээгүй Цомог"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"Хадгалагдсан Зургууд"</string> + <string name="local_source_name" msgid="6487253091085518505">"Төхөөрөмж дээрх зургууд"</string> + <string name="need_to_configure" msgid="1269102638159389032">"Фото сэлгэгдээгүй байна."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"Бүгдийг сонгох"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"Бүгдийг сонгохгүй"</string> + <string name="no_photos" msgid="4262083523147564199">"Төхөөрөмж дээр зураг байхгүй байна."</string> +</resources> diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml new file mode 100644 index 0000000..bfb59f1 --- /dev/null +++ b/res/values-mn/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"Фото дэлгэц хамгаалагч"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"Фото хүснэгт"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"Зургийн Жааз"</string> + <string name="posts_album_name" msgid="5628151551239729515">"Нийтлэлийн зургууд"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"Нэрлэгдээгүй Цомог"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"Хадгалагдсан Зургууд"</string> + <string name="local_source_name" msgid="6487253091085518505">"Төхөөрөмж дээрх зургууд"</string> + <string name="need_to_configure" msgid="1269102638159389032">"Фото сэлгэгдээгүй байна."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"Бүгдийг сонгох"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"Бүгдийг сонгохгүй"</string> + <string name="no_photos" msgid="4262083523147564199">"Төхөөрөмж дээр зураг байхгүй байна."</string> +</resources> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml new file mode 100644 index 0000000..f4df6ee --- /dev/null +++ b/res/values-ms-rMY/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"Pelindung Skrin Foto"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"Jadual Foto"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"Bingkai Foto"</string> + <string name="posts_album_name" msgid="5628151551239729515">"Foto dari Siaran"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"Album Tanpa Nama"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"Foto Stok"</string> + <string name="local_source_name" msgid="6487253091085518505">"Foto pada Peranti"</string> + <string name="need_to_configure" msgid="1269102638159389032">"Tiada foto dipilih."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"Pilih Semua"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"Nyahpilih Semua"</string> + <string name="no_photos" msgid="4262083523147564199">"Tiada foto pada peranti."</string> +</resources> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 0d1b9c0..f4df6ee 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Jadual Foto"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Bingkai Foto"</string> <string name="posts_album_name" msgid="5628151551239729515">"Foto dari Siaran"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Muat Naik Semerta"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album Tanpa Nama"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Foto Stok"</string> <string name="local_source_name" msgid="6487253091085518505">"Foto pada Peranti"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 3fc2057..575d586 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Bildekollasj"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Bilderamme"</string> <string name="posts_album_name" msgid="5628151551239729515">"Bilder fra innlegg"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Direkteopplastinger"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album uten navn"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Bildedatabase"</string> <string name="local_source_name" msgid="6487253091085518505">"Bilder på enheten"</string> diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml new file mode 100644 index 0000000..686cf12 --- /dev/null +++ b/res/values-ne-rNP/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"तस्वीर स्क्रिनसेभरहरू"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"तस्बिर टेबल"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"फोटो फ्रेम"</string> + <string name="posts_album_name" msgid="5628151551239729515">"हुलाकबाट फोटाहरू"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"बेनामी एल्बम"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"स्टक फोटाहरू"</string> + <string name="local_source_name" msgid="6487253091085518505">"उपकरणमा फोटाहरू"</string> + <string name="need_to_configure" msgid="1269102638159389032">"कुनै पनि तस्वीर छनौंट गरिएको छैन।"</string> + <string name="photodream_select_all" msgid="6364858563337927827">"सबैलाई चयन गर्नुहोस्"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"सबैलाई अचयन गर्नुहोस्"</string> + <string name="no_photos" msgid="4262083523147564199">"उपकरणमा कुनै तस्बिर छैन।"</string> +</resources> diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml new file mode 100644 index 0000000..686cf12 --- /dev/null +++ b/res/values-ne/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"तस्वीर स्क्रिनसेभरहरू"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"तस्बिर टेबल"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"फोटो फ्रेम"</string> + <string name="posts_album_name" msgid="5628151551239729515">"हुलाकबाट फोटाहरू"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"बेनामी एल्बम"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"स्टक फोटाहरू"</string> + <string name="local_source_name" msgid="6487253091085518505">"उपकरणमा फोटाहरू"</string> + <string name="need_to_configure" msgid="1269102638159389032">"कुनै पनि तस्वीर छनौंट गरिएको छैन।"</string> + <string name="photodream_select_all" msgid="6364858563337927827">"सबैलाई चयन गर्नुहोस्"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"सबैलाई अचयन गर्नुहोस्"</string> + <string name="no_photos" msgid="4262083523147564199">"उपकरणमा कुनै तस्बिर छैन।"</string> +</resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 4cb6ac8..eb09bf7 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Fototabel"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fotolijst"</string> <string name="posts_album_name" msgid="5628151551239729515">"Foto\'s uit posts"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Automatische uploads"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Naamloos album"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Stockfoto\'s"</string> <string name="local_source_name" msgid="6487253091085518505">"Foto\'s op apparaat"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 11ba127..7e49090 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Tablica ze zdjęciami"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Ramka foto"</string> <string name="posts_album_name" msgid="5628151551239729515">"Zdjęcia z wpisów"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Z autoprzesyłania"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album bez nazwy"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Zdjęcia licencjonowane"</string> <string name="local_source_name" msgid="6487253091085518505">"Zdjęcia na urządzeniu"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 2d7152d..6ac1fdc 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Tabela de Fotografias"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Moldura de Fotografia"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotografias de Mensagens"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Carregamentos Instantâneos"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Álbum Sem Nome"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Banco de Imagens"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotografias no Dispositivo"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 311f249..f8a865c 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Tabela de fotos"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Porta-retrato"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotos de postagens"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Instant Uploads"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Álbum sem nome"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Banco de fotos"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotos no dispositivo"</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index a1a9259..6eba9f4 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Grilă de fotografii"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Cadru cu o fotografie"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotografii din postări"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Încărcări instant"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album fără nume"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotografii din stoc"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotografii de pe gadget"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index de26942..a1a05e7 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Коллаж"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Рамка"</string> <string name="posts_album_name" msgid="5628151551239729515">"Фото из записей"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Фото с телефона"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Альбом без названия"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Снимки из фотобанков"</string> <string name="local_source_name" msgid="6487253091085518505">"Фото на устройстве"</string> diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml new file mode 100644 index 0000000..4f4697d --- /dev/null +++ b/res/values-si-rLK/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"ඡායාරූප තීර සුරකන"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"ඡායාරූප වගුව"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"පින්තූර රාමුව"</string> + <string name="posts_album_name" msgid="5628151551239729515">"සටහනෙන් ඡායාරූප"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"නම් නොකළ ඇල්බමය"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"තොග ඡායාරූප"</string> + <string name="local_source_name" msgid="6487253091085518505">"උපාංගයෙහි ඡායාරූප"</string> + <string name="need_to_configure" msgid="1269102638159389032">"කිසිඳු ඡායාරූපයක් තෝරා නැත."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"සියල්ල තෝරන්න"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"සියල්ල තෝරා නොගන්න"</string> + <string name="no_photos" msgid="4262083523147564199">"උපාංගය තුළ ඡායාරූප නොමැත."</string> +</resources> diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml new file mode 100644 index 0000000..4f4697d --- /dev/null +++ b/res/values-si/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"ඡායාරූප තීර සුරකන"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"ඡායාරූප වගුව"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"පින්තූර රාමුව"</string> + <string name="posts_album_name" msgid="5628151551239729515">"සටහනෙන් ඡායාරූප"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"නම් නොකළ ඇල්බමය"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"තොග ඡායාරූප"</string> + <string name="local_source_name" msgid="6487253091085518505">"උපාංගයෙහි ඡායාරූප"</string> + <string name="need_to_configure" msgid="1269102638159389032">"කිසිඳු ඡායාරූපයක් තෝරා නැත."</string> + <string name="photodream_select_all" msgid="6364858563337927827">"සියල්ල තෝරන්න"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"සියල්ල තෝරා නොගන්න"</string> + <string name="no_photos" msgid="4262083523147564199">"උපාංගය තුළ ඡායාරූප නොමැත."</string> +</resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 94ee9df..36ebbbe 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Fotografická tabuľka"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fotorámček"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotografie z príspevkov"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Okamžité odovzdania"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album bez názvu"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotografie z fotobanky"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotografie v zariadení"</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 3902906..a865482 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"aplikacija Photo Table"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"aplikacija Photo Frame"</string> <string name="posts_album_name" msgid="5628151551239729515">"Fotografije iz objav"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Takojšnji prenosi"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album brez imena"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotografije na zalogi"</string> <string name="local_source_name" msgid="6487253091085518505">"Fotografije v napravi"</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 0fbd11e..16178d0 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Сто за слике"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Рам за слике"</string> <string name="posts_album_name" msgid="5628151551239729515">"Слике из постова"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Инстант отпремања"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Неименовани албум"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Сток фотографије"</string> <string name="local_source_name" msgid="6487253091085518505">"Слике на уређају"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index a97a229..c3a1685 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Bord med foton"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fotoram"</string> <string name="posts_album_name" msgid="5628151551239729515">"Foton från inlägg"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Direktöverföringar"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Namnlöst album"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Bildbyråfoton"</string> <string name="local_source_name" msgid="6487253091085518505">"Foton på enheten"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 74edf3e..7532cc0 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Jedwali la Picha"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fremu ya Picha"</string> <string name="posts_album_name" msgid="5628151551239729515">"Picha kutoka kwenye Machapisho"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Vipakiwa vya papo hapo"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Albamu Isiyo na Jina"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Picha za Akiba"</string> <string name="local_source_name" msgid="6487253091085518505">"Picha katika Kifaa"</string> diff --git a/res/values-sw800dp/config.xml b/res/values-sw800dp/config.xml index ec6a85f..8af15bc 100644 --- a/res/values-sw800dp/config.xml +++ b/res/values-sw800dp/config.xml @@ -14,13 +14,20 @@ limitations under the License. --> <resources> + + <!-- Maximum number of photos to leave on the table.--> + <integer name="table_capacity">8</integer> + <!-- Milliseconds between drops. --> <integer name="table_drop_period">75000</integer> <!-- Milliseconds to wait before the next fast drop.--> <integer name="fast_drop">5000</integer> - <!-- Duration in milliseconds for the pickup animation. --> + <!-- Parts per million ratio between image size and screen size. --> + <integer name="image_ratio">500000</integer> + + <!-- Duration in milliseconds for the pickup animation. --> <integer name="photo_pickup_duration">1500</integer> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 8ae896b..23bdb2e 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"ตารางรูปภาพ"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"กรอบรูป"</string> <string name="posts_album_name" msgid="5628151551239729515">"รูปภาพจากโพสต์"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"อัปโหลดทันใจ"</string> <string name="unknown_album_name" msgid="2135521368192091267">"อัลบั้มที่ไม่มีชื่อ"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"คลังภาพ"</string> <string name="local_source_name" msgid="6487253091085518505">"รูปภาพในอุปกรณ์"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index ca83b8d..3cbecb1 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Talahanayan ng Larawan"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Frame ng Larawan"</string> <string name="posts_album_name" msgid="5628151551239729515">"Mga Larawan mula sa Mga Post"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Mga Instant na Upload"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Walang Pangalang Album"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Mga Stock na Larawan"</string> <string name="local_source_name" msgid="6487253091085518505">"Mga Larawan sa Device"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 246082f..0057ba8 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Fotoğraf Tablosu"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Fotoğraf Çerçevesi"</string> <string name="posts_album_name" msgid="5628151551239729515">"Yayınlardaki Fotoğraflar"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Hızlı Yüklenenler"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Adsız Albüm"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Stok Fotoğraflar"</string> <string name="local_source_name" msgid="6487253091085518505">"Cihazdaki Fotoğraflar"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index ea56d1c..fe6bd55 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Таблиця з фотографій"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Фоторамка"</string> <string name="posts_album_name" msgid="5628151551239729515">"Фото з публікацій"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Мобільне завантаження"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Альбом без назви"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Фотографії з фотобанку"</string> <string name="local_source_name" msgid="6487253091085518505">"Фотографії на пристрої"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 4b145f5..e26b1b3 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Bảng ảnh"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Khung ảnh"</string> <string name="posts_album_name" msgid="5628151551239729515">"Ảnh từ bài đăng"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Tải lên tức thì"</string> <string name="unknown_album_name" msgid="2135521368192091267">"Album chưa đặt tên"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Ảnh trên kho ảnh"</string> <string name="local_source_name" msgid="6487253091085518505">"Ảnh trên thiết bị"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 80b0790..92cd1e6 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"照片桌面"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"相框"</string> <string name="posts_album_name" msgid="5628151551239729515">"信息中的照片"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"即时上传"</string> <string name="unknown_album_name" msgid="2135521368192091267">"未命名相册"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"图库照片"</string> <string name="local_source_name" msgid="6487253091085518505">"设备中的照片"</string> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml new file mode 100644 index 0000000..df4db7b --- /dev/null +++ b/res/values-zh-rHK/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="6441943862284988546">"相片屏幕保護程式"</string> + <string name="table_screensaver_name" msgid="1150228032617397055">"相片表"</string> + <string name="flipper_screensaver_name" msgid="6988572107391523141">"相框"</string> + <string name="posts_album_name" msgid="5628151551239729515">"訊息中附加的相片"</string> + <string name="unknown_album_name" msgid="2135521368192091267">"未命名的相簿"</string> + <string name="stock_photo_album_name" msgid="3150527596227525460">"圖庫相片"</string> + <string name="local_source_name" msgid="6487253091085518505">"裝置上的相片"</string> + <string name="need_to_configure" msgid="1269102638159389032">"未選取相片。"</string> + <string name="photodream_select_all" msgid="6364858563337927827">"全部選取"</string> + <string name="photodream_select_none" msgid="8816452124894525861">"全部取消選取"</string> + <string name="no_photos" msgid="4262083523147564199">"裝置上沒有任何相片。"</string> +</resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index a3242f1..61bf8fa 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"相片表格"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"相片邊框"</string> <string name="posts_album_name" msgid="5628151551239729515">"訊息中的相片"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"即時上傳"</string> <string name="unknown_album_name" msgid="2135521368192091267">"未命名的相簿"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"圖庫相片"</string> <string name="local_source_name" msgid="6487253091085518505">"裝置上的相片"</string> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 885a2bf..7dc45d4 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -20,7 +20,6 @@ <string name="table_screensaver_name" msgid="1150228032617397055">"Ithebula lesithombe"</string> <string name="flipper_screensaver_name" msgid="6988572107391523141">"Uzimele wesithombe"</string> <string name="posts_album_name" msgid="5628151551239729515">"Izithombe ezisuka kokuthunyelwe"</string> - <string name="uploads_album_name" msgid="4057519060978630370">"Ukulayisha okuzenzekelayo"</string> <string name="unknown_album_name" msgid="2135521368192091267">"I-albhamu engaqanjiwe"</string> <string name="stock_photo_album_name" msgid="3150527596227525460">"Izithombe zesitoko"</string> <string name="local_source_name" msgid="6487253091085518505">"Izithombe kudivayisi"</string> diff --git a/res/values/config.xml b/res/values/config.xml index c3a6e65..9087266 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -109,5 +109,8 @@ <!-- Milliseconds that the focus will remain without user interaction. --> <integer name="max_focus_time">5000</integer> + <!-- Enable hardware layer optimization (interferes with dragging). --> + <bool name="enable_background_optimization">false</bool> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1f64e10..392c6a9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -26,9 +26,6 @@ <!-- Name of the album that contains all g+ post photos, copy from Gallery. --> <string name="posts_album_name">Photos from Posts</string> - <!-- Name of the album that contains instant upload photos, copy from Gallery. --> - <string name="uploads_album_name">Instant Uploads</string> - <!-- Name for an album that doesn't seem to have any name at all. --> <string name="unknown_album_name">Unnamed Album</string> diff --git a/src/com/android/dreams/phototable/LocalSource.java b/src/com/android/dreams/phototable/LocalSource.java index cf2e0ec..a483d60 100644 --- a/src/com/android/dreams/phototable/LocalSource.java +++ b/src/com/android/dreams/phototable/LocalSource.java @@ -18,6 +18,7 @@ package com.android.dreams.phototable; import android.content.Context; import android.content.SharedPreferences; import android.database.Cursor; +import android.net.Uri; import android.provider.MediaStore; import java.io.FileInputStream; @@ -58,12 +59,21 @@ public class LocalSource extends CursorPhotoSource { public Collection<AlbumData> findAlbums() { log(TAG, "finding albums"); HashMap<String, AlbumData> foundAlbums = new HashMap<String, AlbumData>(); + findAlbums(false, foundAlbums); + findAlbums(true, foundAlbums); + log(TAG, "found " + foundAlbums.size() + " items."); + mFoundAlbumIds = foundAlbums.keySet(); + return foundAlbums.values(); + } + + public void findAlbums(boolean internal, HashMap<String, AlbumData> foundAlbums) { + Uri uri = internal ? MediaStore.Images.Media.INTERNAL_CONTENT_URI + : MediaStore.Images.Media.EXTERNAL_CONTENT_URI; String[] projection = {MediaStore.Images.Media.DATA, MediaStore.Images.Media.BUCKET_ID, MediaStore.Images.Media.BUCKET_DISPLAY_NAME, MediaStore.Images.Media.DATE_TAKEN}; // This is a horrible hack that closes the where clause and injects a grouping clause. - Cursor cursor = mResolver.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, - projection, null, null, null); + Cursor cursor = mResolver.query(uri, projection, null, null, null); if (cursor != null) { cursor.moveToPosition(-1); @@ -76,7 +86,7 @@ public class LocalSource extends CursorPhotoSource { log(TAG, "can't find the ID column!"); } else { while (cursor.moveToNext()) { - String id = TAG + ":" + cursor.getString(bucketIndex); + String id = constructId(internal, cursor.getString(bucketIndex)); AlbumData data = foundAlbums.get(id); if (foundAlbums.get(id) == null) { data = new AlbumData(); @@ -105,11 +115,11 @@ public class LocalSource extends CursorPhotoSource { } } cursor.close(); - } - log(TAG, "found " + foundAlbums.size() + " items."); - mFoundAlbumIds = foundAlbums.keySet(); - return foundAlbums.values(); + } + + public static String constructId(boolean internal, String bucketId) { + return TAG + ":" + bucketId + (internal ? ":i" : ""); } @Override @@ -120,8 +130,7 @@ public class LocalSource extends CursorPhotoSource { MediaStore.Images.Media.BUCKET_ID, MediaStore.Images.Media.BUCKET_DISPLAY_NAME}; String selection = MediaStore.Images.Media.BUCKET_ID + " = '" + data.albumId + "'"; - data.cursor = mResolver.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, - projection, selection, null, null); + data.cursor = mResolver.query(data.uri, projection, selection, null, null); } @Override @@ -169,12 +178,21 @@ public class LocalSource extends CursorPhotoSource { protected Collection<ImageData> findImages(int howMany) { log(TAG, "finding images"); LinkedList<ImageData> foundImages = new LinkedList<ImageData>(); + boolean internalFirst = mRNG.nextInt(2) == 0; // filp a coin to be fair + findImages(internalFirst, howMany, foundImages); + findImages(!internalFirst, howMany - foundImages.size(), foundImages); + log(TAG, "found " + foundImages.size() + " items."); + return foundImages; + } + protected void findImages(boolean internal, int howMany, LinkedList<ImageData> foundImages ) { + Uri uri = internal ? MediaStore.Images.Media.INTERNAL_CONTENT_URI + : MediaStore.Images.Media.EXTERNAL_CONTENT_URI; String[] projection = {MediaStore.Images.Media.DATA, MediaStore.Images.Media.ORIENTATION, MediaStore.Images.Media.BUCKET_ID, MediaStore.Images.Media.BUCKET_DISPLAY_NAME}; String selection = ""; for (String id : getFoundAlbums()) { - if (mSettings.isAlbumEnabled(id)) { + if (isInternalId(id) == internal && mSettings.isAlbumEnabled(id)) { String[] parts = id.split(":"); if (parts.length > 1) { if (selection.length() > 0) { @@ -185,11 +203,9 @@ public class LocalSource extends CursorPhotoSource { } } if (selection.isEmpty()) { - return foundImages; + return; } - - Cursor cursor = mResolver.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, - projection, selection, null, null); + Cursor cursor = mResolver.query(uri, projection, selection, null, null); if (cursor != null) { int dataIndex = cursor.getColumnIndex(MediaStore.Images.Media.DATA); @@ -203,6 +219,7 @@ public class LocalSource extends CursorPhotoSource { } else { while (foundImages.size() < howMany && cursor.moveToNext()) { ImageData data = unpackImageData(cursor, null); + data.uri = uri; foundImages.offer(data); mLastPosition = cursor.getPosition(); } @@ -216,8 +233,10 @@ public class LocalSource extends CursorPhotoSource { cursor.close(); } - log(TAG, "found " + foundImages.size() + " items."); - return foundImages; + } + + private boolean isInternalId(String id) { + return id.endsWith("i"); } @Override diff --git a/src/com/android/dreams/phototable/PhotoDreamSettingsReceiver.java b/src/com/android/dreams/phototable/PhotoDreamSettingsReceiver.java new file mode 100644 index 0000000..208441b --- /dev/null +++ b/src/com/android/dreams/phototable/PhotoDreamSettingsReceiver.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.dreams.phototable; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; +import android.util.Log; + +import java.util.ArrayList; +import java.util.List; + +public class PhotoDreamSettingsReceiver extends BroadcastReceiver { + private static final String TAG = "PhotoDreamSettingsReceiver"; + private static final String LOCAL_AUTHORITY = "media"; + private static final String INTERNAL = "internal"; + private static final boolean DEBUG = false; + + public static final String ACTION_ADD_ALBUM = "add"; + public static final String ACTION_REMOVE_ALBUM = "remove"; + public static final String EXTRA_ALBUMS = "albums"; + + @Override + public void onReceive(Context context, Intent intent) { + AlbumSettings settings[] = { + AlbumSettings.getAlbumSettings( + context.getSharedPreferences(FlipperDreamSettings.PREFS_NAME, 0)), + AlbumSettings.getAlbumSettings( + context.getSharedPreferences(PhotoTableDreamSettings.PREFS_NAME, 0)) + }; + + boolean shown = ACTION_ADD_ALBUM.equals(intent.getAction()); + ArrayList<String> albumUris = intent.getStringArrayListExtra(EXTRA_ALBUMS); + for (String albumUriString: albumUris) { + Uri albumUri = Uri.parse(albumUriString); + String type = albumUri.getEncodedAuthority(); + List<String> path = albumUri.getPathSegments(); + + String albumId = null; + if (LOCAL_AUTHORITY.equals(type)) { + if (path.size() > 3) { + albumId = LocalSource.constructId(INTERNAL.equals(path.get(0)), path.get(3)); + } + } else { + if (path.size() > 1) { + albumId = PicasaSource.constructId(path.get(1)); + } + } + if (DEBUG) Log.d(TAG, "receive: " + albumId + " is " + shown); + for (int idx = 0; idx < settings.length; idx++) { + settings[idx].setAlbumEnabled(albumId, shown); + } + } + } +} diff --git a/src/com/android/dreams/phototable/PhotoSource.java b/src/com/android/dreams/phototable/PhotoSource.java index fc4cf7b..d05eace 100644 --- a/src/com/android/dreams/phototable/PhotoSource.java +++ b/src/com/android/dreams/phototable/PhotoSource.java @@ -23,6 +23,7 @@ import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Matrix; +import android.net.Uri; import android.util.Log; import java.io.BufferedInputStream; @@ -44,7 +45,7 @@ public abstract class PhotoSource { // This should be large enough for BitmapFactory to decode the header so // that we can mark and reset the input stream to avoid duplicate network i/o - private static final int BUFFER_SIZE = 128 * 1024; + private static final int BUFFER_SIZE = 32 * 1024; public class ImageData { public String id; @@ -54,6 +55,7 @@ public abstract class PhotoSource { protected String albumId; protected Cursor cursor; protected int position; + protected Uri uri; InputStream getStream(int longSide) { return PhotoSource.this.getStream(this, longSide); @@ -184,7 +186,15 @@ public abstract class PhotoSource { } log(TAG, "decoding with inSampleSize " + options.inSampleSize); - bis.reset(); + try { + bis.reset(); + } catch (IOException ioe) { + // start over, something went wrong and we read too far into the image. + bis.close(); + is = data.getStream(longSide); + bis = new BufferedInputStream(is); + log(TAG, "resetting the stream"); + } options.inJustDecodeBounds = false; image = BitmapFactory.decodeStream(bis, null, options); rawLongSide = Math.max(options.outWidth, options.outHeight); diff --git a/src/com/android/dreams/phototable/PhotoTable.java b/src/com/android/dreams/phototable/PhotoTable.java index 7e7f92e..5cdd70f 100644 --- a/src/com/android/dreams/phototable/PhotoTable.java +++ b/src/com/android/dreams/phototable/PhotoTable.java @@ -34,6 +34,7 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.ViewParent; import android.view.ViewPropertyAnimator; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; @@ -44,7 +45,6 @@ import java.util.ArrayList; import java.util.Formatter; import java.util.HashSet; import java.util.LinkedList; -import java.util.List; import java.util.Random; import java.util.Set; @@ -105,11 +105,10 @@ public class PhotoTable extends FrameLayout { private final EdgeSwipeDetector mEdgeSwipeDetector; private final KeyboardInterpreter mKeyboardInterpreter; private final boolean mStoryModeEnabled; + private final boolean mBackgroudOptimization; private final long mPickUpDuration; private final int mMaxSelectionTime; private final int mMaxFocusTime; - private final List<View> mAnimating; - private DreamService mDream; private PhotoLaunchTask mPhotoLaunchTask; private LoadNaturalSiblingTask mLoadOnDeckTasks[]; @@ -125,6 +124,8 @@ public class PhotoTable extends FrameLayout { private int mHighlightColor; private ViewGroup mBackground; private ViewGroup mStageLeft; + private View mScrim; + private final Set<View> mWaitingToJoinBackground; public PhotoTable(Context context, AttributeSet as) { super(context, as); @@ -143,6 +144,7 @@ public class PhotoTable extends FrameLayout { mRedealCount = mResources.getInteger(R.integer.redeal_count); mTapToExit = mResources.getBoolean(R.bool.enable_tap_to_exit); mStoryModeEnabled = mResources.getBoolean(R.bool.enable_story_mode); + mBackgroudOptimization = mResources.getBoolean(R.bool.enable_background_optimization); mHighlightColor = mResources.getColor(R.color.highlight_color); mMaxSelectionTime = mResources.getInteger(R.integer.max_selection_time); mMaxFocusTime = mResources.getInteger(R.integer.max_focus_time); @@ -154,7 +156,7 @@ public class PhotoTable extends FrameLayout { mOnTable = new LinkedList<View>(); mPhotoSource = new PhotoSourcePlexor(getContext(), getContext().getSharedPreferences(PhotoTableDreamSettings.PREFS_NAME, 0)); - mAnimating = new ArrayList<View>(); + mWaitingToJoinBackground = new HashSet<View>(); mLauncher = new Launcher(); mFocusReaper = new FocusReaper(); mSelectionReaper = new SelectionReaper(); @@ -170,6 +172,7 @@ public class PhotoTable extends FrameLayout { public void onFinishInflate() { mBackground = (ViewGroup) findViewById(R.id.background); mStageLeft = (ViewGroup) findViewById(R.id.stageleft); + mScrim = findViewById(R.id.scrim); } public void setDream(DreamService dream) { @@ -283,7 +286,9 @@ public class PhotoTable extends FrameLayout { } public void setDefaultFocus() { - setFocus(mOnTable.getLast()); + if (mOnTable.size() > 0) { + setFocus(mOnTable.getLast()); + } } public void setFocus(View focus) { @@ -353,7 +358,9 @@ public class PhotoTable extends FrameLayout { public View moveFocus(View focus, float direction, float angle) { if (focus == null) { - setFocus(mOnTable.getLast()); + if (mOnTable.size() > 0) { + setFocus(mOnTable.getLast()); + } } else { final double alpha = Math.toRadians(direction); final double beta = Math.toRadians(Math.min(angle, 180f) / 2f); @@ -603,29 +610,60 @@ public class PhotoTable extends FrameLayout { /** De-emphasize the other photos on the table. */ public void fadeOutBackground(final View photo) { - mBackground.animate() - .withLayer() - .setDuration(mPickUpDuration) - .alpha(0f); + resolveBackgroundQueue(); + if (mBackgroudOptimization) { + mBackground.animate() + .withLayer() + .setDuration(mPickUpDuration) + .alpha(0f); + } else { + mScrim.setAlpha(0f); + mScrim.setVisibility(View.VISIBLE); + bringChildToFront(mScrim); + bringChildToFront(photo); + mScrim.animate() + .withLayer() + .setDuration(mPickUpDuration) + .alpha(1f); + } } /** Return the other photos to foreground status. */ public void fadeInBackground(final View photo) { - mAnimating.add(photo); - mBackground.animate() - .withLayer() - .setDuration(mPickUpDuration) - .alpha(1f) - .withEndAction(new Runnable() { - @Override - public void run() { - mAnimating.remove(photo); - if (!mAnimating.contains(photo)) { - moveToBackground(photo); - } - } - }); + if (mBackgroudOptimization) { + mWaitingToJoinBackground.add(photo); + mBackground.animate() + .withLayer() + .setDuration(mPickUpDuration) + .alpha(1f) + .withEndAction(new Runnable() { + @Override + public void run() { + resolveBackgroundQueue(); + } + }); + } else { + bringChildToFront(mScrim); + bringChildToFront(photo); + mScrim.animate() + .withLayer() + .setDuration(mPickUpDuration) + .alpha(0f) + .withEndAction(new Runnable() { + @Override + public void run() { + mScrim.setVisibility(View.GONE); + } + }); + } + } + + private void resolveBackgroundQueue() { + for(View photo: mWaitingToJoinBackground) { + moveToBackground(photo); + } + mWaitingToJoinBackground.clear(); } /** Dispose of the photo gracefully, in case we can see some of it. */ @@ -824,7 +862,7 @@ public class PhotoTable extends FrameLayout { log("animate it"); // toss onto table - mAnimating.add(photo); + resolveBackgroundQueue(); photo.animate() .withLayer() .scaleX(mTableRatio / mImageRatio) @@ -837,34 +875,34 @@ public class PhotoTable extends FrameLayout { .withEndAction(new Runnable() { @Override public void run() { - mAnimating.remove(photo); - if (!mAnimating.contains(photo)) { - moveToBackground(photo); - } + mWaitingToJoinBackground.add(photo); } }); } private void moveToBackground(View photo) { - if (!isInBackground(photo)) { - removeView(photo); + if (mBackgroudOptimization && !isInBackground(photo)) { + removeViewFromParent(photo); mBackground.addView(photo, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); } } private void exitStageLeft(View photo) { - if (isInBackground(photo)) { - mBackground.removeView(photo); - } else { - removeView(photo); - } + removeViewFromParent(photo); mStageLeft.addView(photo, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); } + private void removeViewFromParent(View photo) { + ViewParent parent = photo.getParent(); + if (parent != null) { // should never be null, just being paranoid + ((ViewGroup) parent).removeView(photo); + } + } + private void moveToForeground(View photo) { - if (isInBackground(photo)) { + if (mBackgroudOptimization && isInBackground(photo)) { mBackground.removeView(photo); addView(photo, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); @@ -872,7 +910,7 @@ public class PhotoTable extends FrameLayout { } private boolean isInBackground(View photo) { - return mBackground.indexOfChild(photo) != -1; + return mBackgroudOptimization && mBackground.indexOfChild(photo) != -1; } /** wrap all orientations to the interval [-180, 180). */ @@ -883,7 +921,7 @@ public class PhotoTable extends FrameLayout { return result; } - /** Animate the selected photo to the foregound: zooming in to bring it foreward. */ + /** Animate the selected photo to the foreground: zooming in to bring it forward. */ private void pickUp(final View photo) { float photoWidth = photo.getWidth(); float photoHeight = photo.getHeight(); @@ -899,6 +937,7 @@ public class PhotoTable extends FrameLayout { log("animate it"); // lift up to the glass for a good look + mWaitingToJoinBackground.remove(photo); moveToForeground(photo); photo.animate() .withLayer() @@ -937,7 +976,7 @@ public class PhotoTable extends FrameLayout { private void recycle(View photo) { if (photo != null) { - removeView(photo); + removeViewFromParent(photo); mPhotoSource.recycle(getBitmap(photo)); } } diff --git a/src/com/android/dreams/phototable/PicasaSource.java b/src/com/android/dreams/phototable/PicasaSource.java index 0db98af..26fd03e 100644 --- a/src/com/android/dreams/phototable/PicasaSource.java +++ b/src/com/android/dreams/phototable/PicasaSource.java @@ -67,7 +67,6 @@ public class PicasaSource extends CursorPhotoSource { private final int mMaxPostAblums; private final String mPostsAlbumName; - private final String mUploadsAlbumName; private final String mUnknownAlbumName; private final LinkedList<ImageData> mRecycleBin; private final ConnectivityManager mConnectivityManager; @@ -83,7 +82,6 @@ public class PicasaSource extends CursorPhotoSource { mLastPosition = INVALID; mMaxPostAblums = mResources.getInteger(R.integer.max_post_albums); mPostsAlbumName = mResources.getString(R.string.posts_album_name, "Posts"); - mUploadsAlbumName = mResources.getString(R.string.uploads_album_name, "Instant Uploads"); mUnknownAlbumName = mResources.getString(R.string.unknown_album_name, "Unknown"); mMaxRecycleSize = mResources.getInteger(R.integer.recycle_image_pool_size); mConnectivityManager = @@ -354,7 +352,7 @@ public class PicasaSource extends CursorPhotoSource { log(TAG, "can't find the ID column!"); } else { while (cursor.moveToNext()) { - String id = TAG + ":" + cursor.getString(idIndex); + String id = constructId(cursor.getString(idIndex)); String user = (userIndex >= 0 ? cursor.getString(userIndex) : "-1"); String type = (typeIndex >= 0 ? cursor.getString(typeIndex) : "none"); boolean isPosts = (typeIndex >= 0 && PICASA_POSTS_TYPE.equals(type)); @@ -369,12 +367,16 @@ public class PicasaSource extends CursorPhotoSource { if (isPosts) { log(TAG, "replacing " + id + " with " + PICASA_POSTS_TYPE); - id = TAG + ":" + PICASA_POSTS_TYPE + ":" + user; + id = constructId(PICASA_POSTS_TYPE + ":" + user); } if (isUpload) { - log(TAG, "replacing " + id + " with " + PICASA_UPLOAD_TYPE); - id = TAG + ":" + PICASA_UPLOAD_TYPE + ":" + user; + // check for old-style name for this album, and upgrade settings. + String uploadId = constructId(PICASA_UPLOAD_TYPE + ":" + user); + if (mSettings.isAlbumEnabled(uploadId)) { + mSettings.setAlbumEnabled(uploadId, false); + mSettings.setAlbumEnabled(id, true); + } } String thumbnailUrl = null; @@ -387,8 +389,6 @@ public class PicasaSource extends CursorPhotoSource { if (isPosts) { data.title = mPostsAlbumName; - } else if (isUpload) { - data.title = mUploadsAlbumName; } else if (titleIndex >= 0) { data.title = cursor.getString(titleIndex); } else { @@ -425,6 +425,10 @@ public class PicasaSource extends CursorPhotoSource { return foundAlbums.values(); } + public static String constructId(String serverId) { + return TAG + ":" + serverId; + } + @Override protected InputStream getStream(ImageData data, int longSide) { InputStream is = null; |