Import translations. DO NOT MERGE
am: d431416852 -s ours
Change-Id: I26f4be3e0e4c60267065f1857806ec7ca18e7b62
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
deleted file mode 100644
index 7557918..0000000
--- a/res/values-be-rBY/strings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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">"Фота з апублiкаваных паведамленняў"</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>
- <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-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
deleted file mode 100644
index 5c1711b..0000000
--- a/res/values-bs-rBA/strings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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">"Pozadine sa fotografijama"</string>
- <string name="table_screensaver_name" msgid="1150228032617397055">"Foto-sto"</string>
- <string name="flipper_screensaver_name" msgid="6988572107391523141">"Foto-ram"</string>
- <string name="posts_album_name" msgid="5628151551239729515">"Fotografije iz objava"</string>
- <string name="unknown_album_name" msgid="2135521368192091267">"Neimenovani album"</string>
- <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotografije ugrađene u aplikaciju"</string>
- <string name="local_source_name" msgid="6487253091085518505">"Fotografije na uređaju"</string>
- <string name="need_to_configure" msgid="1269102638159389032">"Fotografija nije odabrana."</string>
- <string name="photodream_select_all" msgid="6364858563337927827">"Odaberi sve"</string>
- <string name="photodream_select_none" msgid="8816452124894525861">"Poništi odabir"</string>
- <string name="no_photos" msgid="4262083523147564199">"Nema fotografija na uređaju."</string>
-</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 058e311..686cf12 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -16,14 +16,14 @@
<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="app_name" msgid="6441943862284988546">"तस्वीर स्क्रिनसेभरहरू"</string>
<string name="table_screensaver_name" msgid="1150228032617397055">"तस्बिर टेबल"</string>
- <string name="flipper_screensaver_name" msgid="6988572107391523141">"तस्बिर फ्रेम"</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="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>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 893c79a..f4a37b0 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -22,9 +22,9 @@
<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="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>
+ <string name="no_photos" msgid="4262083523147564199">"ਡਿਵਾਈਸ ਤੇ ਕੋਈ ਫੋਟੋਆਂ ਨਹੀਂ।"</string>
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 51d12b1..b0a7eb1 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -16,9 +16,9 @@
<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">"Ekran lavhalari"</string>
- <string name="table_screensaver_name" msgid="1150228032617397055">"Kollaj"</string>
- <string name="flipper_screensaver_name" msgid="6988572107391523141">"Hoshiya"</string>
+ <string name="app_name" msgid="6441943862284988546">"Rasmli ekran lavhalari"</string>
+ <string name="table_screensaver_name" msgid="1150228032617397055">"Rasm jadvali"</string>
+ <string name="flipper_screensaver_name" msgid="6988572107391523141">"Rasm romi"</string>
<string name="posts_album_name" msgid="5628151551239729515">"Post rasmlari"</string>
<string name="unknown_album_name" msgid="2135521368192091267">"Nomlanmagan albom"</string>
<string name="stock_photo_album_name" msgid="3150527596227525460">"Ilovadagi rasmlar"</string>
diff --git a/src/com/android/dreams/phototable/CursorPhotoSource.java b/src/com/android/dreams/phototable/CursorPhotoSource.java
index f010a92..6af0807 100644
--- a/src/com/android/dreams/phototable/CursorPhotoSource.java
+++ b/src/com/android/dreams/phototable/CursorPhotoSource.java
@@ -49,6 +49,7 @@
if (!current.cursor.isAfterLast()) {
data = unpackImageData(current.cursor, null);
data.cursor = current.cursor;
+ data.uri = current.uri;
data.position = current.cursor.getPosition();
}
return data;
@@ -66,6 +67,7 @@
if (!current.cursor.isBeforeFirst()) {
data = unpackImageData(current.cursor, null);
data.cursor = current.cursor;
+ data.uri = current.uri;
data.position = current.cursor.getPosition();
}
return data;
