Merge \\"Fixed NullPointerException during Cursor reuse\\" am: 6fc8240932
am: 6c4f9434cc
Change-Id: Id751e96c7d29c3b9e87cde27b7ac2fb936d0194e
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c401ef7..7a2b9b5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,6 +15,7 @@
android:largeHeap="true">
<service android:name="PhotoTableDream"
android:exported="true"
+ android:permission="android.permission.BIND_DREAM_SERVICE"
android:icon="@mipmap/ic_launcher_phototable"
android:label="@string/table_screensaver_name">
<meta-data
@@ -36,6 +37,7 @@
</activity>
<service android:name="FlipperDream"
android:exported="true"
+ android:permission="android.permission.BIND_DREAM_SERVICE"
android:icon="@mipmap/ic_launcher_photoframe"
android:label="@string/flipper_screensaver_name">
<meta-data
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..9796200
--- /dev/null
+++ b/res/values-b+sr+Latn/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">"Čuvari ekrana sa slikama"</string>
+ <string name="table_screensaver_name" msgid="1150228032617397055">"Sto za slike"</string>
+ <string name="flipper_screensaver_name" msgid="6988572107391523141">"Ram za slike"</string>
+ <string name="posts_album_name" msgid="5628151551239729515">"Slike iz postova"</string>
+ <string name="unknown_album_name" msgid="2135521368192091267">"Neimenovani album"</string>
+ <string name="stock_photo_album_name" msgid="3150527596227525460">"Stok fotografije"</string>
+ <string name="local_source_name" msgid="6487253091085518505">"Slike na uređaju"</string>
+ <string name="need_to_configure" msgid="1269102638159389032">"Nije izabrana nijedna slika."</string>
+ <string name="photodream_select_all" msgid="6364858563337927827">"Izaberi sve"</string>
+ <string name="photodream_select_none" msgid="8816452124894525861">"Opozovi sve"</string>
+ <string name="no_photos" msgid="4262083523147564199">"Nema slika na uređaju."</string>
+</resources>
