release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release-4017779 snap-temp-L47900000064949209

Change-Id: I69c2401d05d9635988a79251e1402950a90f2009

5 files changed, 8 insertions, 15 deletions

diff --git a/Android.mk b/Android.mk
index 885e474..32ca5f3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,22 +46,15 @@ LOCAL_CERTIFICATE := platform
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v7-appcompat \
     android-support-v4 \
     android-support-design \
     android-support-transition \
     android-support-v7-recyclerview
 
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/res \
-    frameworks/support/v7/appcompat/res \
-    frameworks/support/design/res \
-    frameworks/support/transition/res \
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
-    --extra-packages android.support.design \
-    --extra-packages android.support.v7.appcompat \
-    --extra-packages android.support.transition
+LOCAL_USE_AAPT2 := true
 
 include $(BUILD_PACKAGE)
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b3595e5..7682346 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -21,11 +21,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="application_name" msgid="4119979710394894209">"Izbornik animiranih pozadinskih slika"</string>
     <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Odaberite animiranu pozadinsku sliku"</string>
-    <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Aktivne pozadine"</string>
+    <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Animirane pozadinske slike"</string>
     <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Pregled animirane pozadinske slike"</string>
     <string name="configure_wallpaper" msgid="7396598925806288258">"Postavke..."</string>
     <string name="wallpaper_instructions" msgid="4215640646180727542">"Postavi pozadinsku sliku"</string>
-    <string name="live_wallpaper_empty" msgid="4278728108785853407">"Nema aktivnih pozadina."</string>
+    <string name="live_wallpaper_empty" msgid="4278728108785853407">"Nema animiranih pozadinskih slika."</string>
     <string name="set_live_wallpaper" msgid="2381437614949033266">"Postavi pozadinsku sliku"</string>
     <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>, <xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
     <string name="live_wallpaper_loading" msgid="2488371303130330734">"Učitavanje animirane pozadinske slike..."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 7260950..11d49ec 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -21,7 +21,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
     <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Select live wallpaper"</string>
-    <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpapers"</string>
+    <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live wallpapers"</string>
     <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Live wallpaper preview"</string>
     <string name="configure_wallpaper" msgid="7396598925806288258">"Settings…"</string>
     <string name="wallpaper_instructions" msgid="4215640646180727542">"Set wallpaper"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 7260950..11d49ec 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -21,7 +21,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
     <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Select live wallpaper"</string>
-    <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpapers"</string>
+    <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live wallpapers"</string>
     <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Live wallpaper preview"</string>
     <string name="configure_wallpaper" msgid="7396598925806288258">"Settings…"</string>
     <string name="wallpaper_instructions" msgid="4215640646180727542">"Set wallpaper"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 7260950..11d49ec 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -21,7 +21,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
     <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Select live wallpaper"</string>
-    <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpapers"</string>
+    <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live wallpapers"</string>
     <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Live wallpaper preview"</string>
     <string name="configure_wallpaper" msgid="7396598925806288258">"Settings…"</string>
     <string name="wallpaper_instructions" msgid="4215640646180727542">"Set wallpaper"</string>