Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: db7d5f301b
am: 791d498cb0
Change-Id: I97fad93e78f7d343c696da0292968778604bbb72
diff --git a/Android.mk b/Android.mk
index 507dd8e..0536310 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,17 +48,17 @@
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-annotations
+ androidx.annotation_annotation
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v7-appcompat \
- android-support-compat \
- android-support-core-utils \
- android-support-core-ui \
- android-support-fragment \
- $(ANDROID_SUPPORT_DESIGN_TARGETS) \
- android-support-transition \
- android-support-v7-recyclerview
+ androidx.appcompat_appcompat \
+ androidx.core_core \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.fragment_fragment \
+ androidx.design_design \
+ androidx.transition_transition \
+ androidx.recyclerview_recyclerview
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/proguard.flags b/proguard.flags
index 5320720..cddd821 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -7,5 +7,5 @@
public <init>(android.content.Context, android.util.AttributeSet);
}
--keep class android.support.design.widget.CoordinatorLayout
+-keep class androidx.coordinatorlayout.widget.CoordinatorLayout
-keep class android.support.design.widget.BottomSheetBehavior
\ No newline at end of file
diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml
index fb8ab5c..5eb486f 100644
--- a/res/layout/live_wallpaper_preview.xml
+++ b/res/layout/live_wallpaper_preview.xml
@@ -39,7 +39,7 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true">
- <android.support.design.widget.CoordinatorLayout
+ <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -122,7 +122,7 @@
</RelativeLayout>
- </android.support.design.widget.CoordinatorLayout>
+ </androidx.coordinatorlayout.widget.CoordinatorLayout>
<android.widget.Toolbar android:id="@+id/toolbar"
android:layout_width="match_parent"
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
new file mode 100644
index 0000000..e027262
--- /dev/null
+++ b/res/values-as/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* Copyright (C) 2008 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="application_name" msgid="4119979710394894209">"লাইভ ৱালপেপাৰ বাছনিকৰ্তা"</string>
+ <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"লাইভ ৱালপেপাৰ বাছনি কৰক"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"লাইভ ৱালপেপাৰসমূহ"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"লাইভ ৱালপেপাৰৰ পূৰ্বদৰ্শন"</string>
+ <string name="configure_wallpaper" msgid="7396598925806288258">"ছেটিংসমূহ…"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"ৱালপেপাৰ ছেট কৰক"</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"কোনো লাইভ ৱালপেপাৰ নাই"</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"ৱালপেপাৰ ছেট কৰক"</string>
+ <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="AUTHOR">%2$s</xliff:g>ৰ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
+ <string name="live_wallpaper_loading" msgid="2488371303130330734">"লাইভ ৱালপেপাৰ ল\'ড কৰি থকা হৈছে…"</string>
+ <string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"গৃহ স্ক্ৰীণ"</string>
+ <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"গৃহ স্ক্ৰীণ আৰু লক স্ক্ৰীণ"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"ৱালপেপাৰ সম্পৰ্কীয় তথ্য়ৰ পেনেল সংকুচিত কৰক"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"ৱালপেপাৰ সম্পৰ্কীয় তথ্য়ৰ পেনেল বিস্তাৰ কৰক"</string>
+</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index a42c0a7..8b924fe 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -22,7 +22,7 @@
<string name="application_name" msgid="4119979710394894209">"લાઇવ વૉલપેપર પીકર"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"લાઇવ વૉલપેપર પસંદ કરો"</string>
<string name="live_wallpaper_picker_label" msgid="3218000114890071946">"લાઇવ વૉલપેપર્સ"</string>
- <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"લાઇવ વૉલપેપર પૂર્વાવલોકન"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"લાઇવ વૉલપેપર પ્રીવ્યૂ"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"સેટિંગ્સ…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"વૉલપેપર સેટ કરો"</string>
<string name="live_wallpaper_empty" msgid="4278728108785853407">"કોઈ લાઇવ વૉલપેપર્સ નથી."</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
new file mode 100644
index 0000000..718fc00
--- /dev/null
+++ b/res/values-or/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* Copyright (C) 2008 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="application_name" msgid="4119979710394894209">"ଲାଇଭ୍ ୱାଲପେପର୍ ପିକର୍"</string>
+ <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"ଲାଇଭ୍ ୱାଲପେପର୍ ଚୟନ କରନ୍ତୁ"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"ଲାଇଭ୍ ୱାଲପେପର୍"</string>
+ <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"ଲାଇଭ୍ ୱାଲପେପରର ଝଲକ"</string>
+ <string name="configure_wallpaper" msgid="7396598925806288258">"ସେଟିଙ୍ଗ..."</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"ୱାଲପେପର୍ ସେଟ୍ କରନ୍ତୁ"</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"କୌଣସି ଲାଇଭ୍ ୱାଲପେପର୍ ନାହିଁ"</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"ୱାଲପେପର୍ ସେଟ୍ କରନ୍ତୁ"</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">"ଲାଇଭ୍ ୱାଲପେପରଗୁଡ଼ିକୁ ଲୋଡ୍ କରାଯାଉଛି..."</string>
+ <string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"ହୋମ୍ ସ୍କ୍ରୀନ୍"</string>
+ <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"ହୋମ୍ ସ୍କ୍ରୀନ୍ ଏବଂ ଲକ୍ ସ୍କ୍ରୀନ୍"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"ୱାଲପେପର୍ ସୂଚନା ପ୍ୟାନେଲକୁ ଛୋଟ କରନ୍ତୁ"</string>
+ <string name="expand_attribution_panel" msgid="3151357815478885438">"ୱାଲପେପର୍ ସୂଚନା ପ୍ୟାନେଲ୍ ବଢ଼ାନ୍ତୁ"</string>
+</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 9e1cb1e..fc417f2 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -30,7 +30,7 @@
<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">"நேரலை வால்பேப்பரை ஏற்றுகிறது…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"முகப்புத் திரை"</string>
- <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"முகப்புத் திரையும் பூட்டுத் திரையும்"</string>
+ <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"முகப்புத் திரையும் லாக் ஸ்கிரீனும்"</string>
<string name="collapse_attribution_panel" msgid="4998500891743118630">"வால்பேப்பரின் தகவல் பேனலைச் சுருக்கும் பொத்தான்"</string>
<string name="expand_attribution_panel" msgid="3151357815478885438">"வால்பேப்பரின் தகவல் பேனலை விரிக்கும் பொத்தான்"</string>
</resources>