[automerger] Wallpaper picker fixes am: c382adc882 Change-Id: Ib2480b18ae7bae61e5b29ba58c941bf4c84f7906

commit: e0cd98febbe3196778c8649dd9ae7afb6858c64c [log] [tgz]
author: Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed May 01 00:22:05 2019 +0000
committer: Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed May 01 00:22:05 2019 +0000
tree: ce35581eda173f6579412415ef954452bb34f5a7
parent: 86b09ce6eadf770440b8e58bb6514b57f9b50966 [diff]
parent: c382adc88285c8b889335707c5ea1d8acad7a03c [diff]
diff --git a/.gitignore b/.gitignore
index d6ff8ca..d42f521 100644
--- a/.gitignore
+++ b/.gitignore

@@ -6,5 +6,4 @@
 local.properties
 *.iml
 android.properties
-gradle.properties
 settings.gradle

diff --git a/Android.mk b/Android.mk
index 9b67f61..4f31a65 100755
--- a/Android.mk
+++ b/Android.mk

@@ -16,6 +16,18 @@
 
 LOCAL_PATH := $(call my-dir)
 
+#
+# Prebuilt Java Libraries
+#
+include $(CLEAR_VARS)
+LOCAL_MODULE := libStyleProtos
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_SRC_FILES := libs/style_protos.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SDK_VERSION := current
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE := wallpaper2-glide-target
@@ -40,6 +52,65 @@
 LOCAL_UNINSTALLABLE_MODULE := true
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_USE_AAPT2 := true
+LOCAL_AAPT2_ONLY := true
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STATIC_ANDROID_LIBRARIES := android-support-exifinterface
+LOCAL_SRC_FILES := $(call all-java-files-under, ../../../external/subsampling-scale-image-view/library/src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/../../../external/subsampling-scale-image-view/library/src/main/res
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_SDK_VERSION := current
+LOCAL_MIN_SDK_VERSION := 21
+LOCAL_MODULE := wallpaper-subsampling-scale-image-view
+LOCAL_MANIFEST_FILE := ../../../external/subsampling-scale-image-view/library/src/main/AndroidManifest.xml
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
+#
+# Build rule for WallpaperPicker2 dependencies lib.
+#
+include $(CLEAR_VARS)
+LOCAL_USE_AAPT2 := true
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+    androidx.appcompat_appcompat \
+    androidx.cardview_cardview \
+    androidx.recyclerview_recyclerview \
+    com.google.android.material_material \
+    androidx.exifinterface_exifinterface \
+    wallpaper-subsampling-scale-image-view
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    wallpaper2-glide-target \
+    wallpaper2-disklrucache-target \
+    wallpaper2-gifdecoder-target \
+    volley \
+    libbackup
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_MANIFEST_FILE := AndroidManifest.xml
+
+ifneq (,$(wildcard frameworks/base))
+  LOCAL_STATIC_JAVA_LIBRARIES += SystemUISharedLib styleprotosnano
+  LOCAL_PRIVATE_PLATFORM_APIS := true
+else
+  LOCAL_STATIC_JAVA_LIBRARIES += libSharedSystemUI libStyleProtos
+  LOCAL_SDK_VERSION := current
+endif
+
+LOCAL_MODULE := WallpaperPicker2CommonDepsLib
+LOCAL_PRIVILEGED_MODULE := true
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
 #
 # Build app code.
 #
@@ -49,42 +120,22 @@
 
 LOCAL_USE_AAPT2 := true
 
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-v4 \
-    android-support-v7-appcompat \
-    android-support-v7-cardview \
-    android-support-v7-recyclerview \
-    android-support-compat \
-    $(ANDROID_SUPPORT_DESIGN_TARGETS) \
-    android-support-exifinterface \
-    android-support-media-compat
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    wallpaper2-glide-target \
-    wallpaper2-disklrucache-target \
-    wallpaper2-gifdecoder-target \
-    volley \
-    libbackup \
-    icc_profiles
+LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-    $(call all-java-files-under, src_override) \
-    $(call all-java-files-under, ../../../external/subsampling-scale-image-view/library/src)
+    $(call all-java-files-under, src_override)
 
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
-    $(LOCAL_PATH)/../../../external/subsampling-scale-image-view/library/src/main/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_AAPT_FLAGS := \
-    --auto-add-overlay \
-    --extra-packages com.davemorrissey.labs.subscaleview
-
-LOCAL_SDK_VERSION := current
+ifneq (,$(wildcard frameworks/base))
+  LOCAL_PRIVATE_PLATFORM_APIS := true
+else
+  LOCAL_SDK_VERSION := system_current
+endif
 LOCAL_PACKAGE_NAME := WallpaperPicker2
+LOCAL_JETIFIER_ENABLED := true
 
 include $(BUILD_PACKAGE)
-
-# ==================================================
-include $(call all-makefiles-under,$(LOCAL_PATH))

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 690afd1..0192398 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -3,10 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.android.wallpaper">
 
-  <uses-sdk
-      android:minSdkVersion="16"
-      android:targetSdkVersion="27"/>
-
   <!-- Custom permission to enforce that only this app can notify the running live wallpaper that
        the rotating wallpaper image data changed. -->
   <permission
@@ -16,6 +12,7 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
   <uses-permission android:name="android.permission.SET_WALLPAPER" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />

diff --git a/build.gradle b/build.gradle
index b3dfd92..2148425 100755
--- a/build.gradle
+++ b/build.gradle

@@ -5,7 +5,7 @@
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.0-beta05'
     }
 }
 
@@ -62,8 +62,7 @@
     }
 }
 
-final String SUPPORT_LIBS_VERSION = '28.0.0-SNAPSHOT'
-
+final String ANDROID_X_VERSION = "1.0.0-alpha1"
 
 repositories {
     maven { url "../../../prebuilts/maven_repo/bumptech" }
@@ -74,19 +73,19 @@
 }
 
 dependencies {
-    implementation "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}"
-    implementation "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}"
-    implementation "com.android.support:cardview-v7:${SUPPORT_LIBS_VERSION}"
-    implementation "com.android.support:appcompat-v7:${SUPPORT_LIBS_VERSION}"
-    implementation "com.android.support:design:${SUPPORT_LIBS_VERSION}"
-    implementation "com.android.support:exifinterface:${SUPPORT_LIBS_VERSION}"
-    implementation 'com.android.volley:volley:1.0.0'
+    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
+    implementation "androidx.cardview:cardview:${ANDROID_X_VERSION}"
+    implementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
+    implementation "androidx.exifinterface:exifinterface:${ANDROID_X_VERSION}"
+    implementation "com.google.android.material:material:${ANDROID_X_VERSION}"
+
+    implementation 'com.android.volley:volley:1.1.0'
+
     implementation 'com.github.bumptech.glide:glide:SNAPSHOT'
     implementation 'com.github.bumptech.glide:disklrucache:SNAPSHOT'
     implementation 'com.github.bumptech.glide:gifdecoder:SNAPSHOT'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
 
-
     androidTestImplementation('junit:junit:4.12')
     androidTestImplementation('com.android.support.test:runner:1.0.1')
     androidTestImplementation('org.robolectric:robolectric:3.4.2') {

diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..bde62ac
--- /dev/null
+++ b/gradle.properties

@@ -0,0 +1,3 @@
+# Until all the dependencies move to android X
+android.useAndroidX = true
+android.enableJetifier = true

diff --git a/libs/style_protos.jar b/libs/style_protos.jar
new file mode 100644
index 0000000..8708555
--- /dev/null
+++ b/libs/style_protos.jar
Binary files differ

diff --git a/res/layout/activity_single_fragment_with_toolbar.xml b/res/layout/activity_single_fragment_with_toolbar.xml
index 8c30c7a..fb4c9e6 100755
--- a/res/layout/activity_single_fragment_with_toolbar.xml
+++ b/res/layout/activity_single_fragment_with_toolbar.xml

@@ -18,18 +18,18 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             style="@style/RegularToolbarStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="top" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/fragment_container"

diff --git a/res/layout/activity_top_level_desktop.xml b/res/layout/activity_top_level_desktop.xml
index dc13be3..784d606 100755
--- a/res/layout/activity_top_level_desktop.xml
+++ b/res/layout/activity_top_level_desktop.xml

@@ -24,11 +24,11 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
             style="@style/CategoryTabLayout"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"></android.support.design.widget.TabLayout>
+            android:layout_height="wrap_content"></com.google.android.material.tabs.TabLayout>
 
         <FrameLayout
             android:id="@+id/fragment_container"
@@ -53,7 +53,7 @@
 
     </LinearLayout>
 
-    <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
@@ -71,7 +71,7 @@
             android:orientation="vertical"
             android:visibility="gone"
             app:behavior_peekHeight="0dp"
-            app:layout_behavior="android.support.design.widget.BottomSheetBehavior">
+            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
             <LinearLayout
                 android:id="@+id/bottom_sheet_contents"
@@ -218,6 +218,6 @@
 
         </LinearLayout>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </FrameLayout>

diff --git a/res/layout/dialog_start_rotation.xml b/res/layout/dialog_start_rotation.xml
index deabe45..e58fcfe 100755
--- a/res/layout/dialog_start_rotation.xml
+++ b/res/layout/dialog_start_rotation.xml

@@ -29,7 +29,6 @@
         android:layout_marginRight="@dimen/abc_dialog_padding_material"
         android:layout_marginStart="@dimen/abc_dialog_padding_material"
         android:layout_marginTop="@dimen/start_rotation_dialog_subhead_margin_top"
-        android:textColor="@color/translucent_black_60_alpha"
         android:textSize="@dimen/abc_text_size_subhead_material" />
 
     <LinearLayout
@@ -42,7 +41,7 @@
         android:layout_marginStart="@dimen/start_rotation_dialog_checkbox_area_margin_left"
         android:orientation="horizontal">
 
-        <android.support.v7.widget.AppCompatCheckBox
+        <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/start_rotation_wifi_only_checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -51,7 +50,6 @@
             android:layout_marginRight="@dimen/start_rotation_dialog_checkbox_margin_right"
             android:minHeight="@dimen/start_rotation_dialog_checkbox_min_height"
             android:text="@string/start_rotation_dialog_wifi_only_option_message"
-            android:textColor="@color/translucent_black_60_alpha"
             android:textSize="@dimen/abc_text_size_body_1_material"
             auto:buttonTint="@color/accent_color" />
 

diff --git a/res/layout/fragment_category_picker.xml b/res/layout/fragment_category_picker.xml
index a25bfdc..51bf8d7 100755
--- a/res/layout/fragment_category_picker.xml
+++ b/res/layout/fragment_category_picker.xml

@@ -13,14 +13,15 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/frame_layout"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/category_picker_background_color"
-    android:fitsSystemWindows="true">
+    android:background="?android:colorPrimary">
+    <include layout="@layout/section_header"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/category_grid"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -29,6 +30,7 @@
         android:paddingTop="@dimen/grid_padding"
         android:scrollbarSize="@dimen/grid_padding"
         android:scrollbarThumbVertical="@color/scrollbar_thumb_color_dark"
-        android:scrollbars="vertical" />
+        android:scrollbars="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-</FrameLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

diff --git a/res/layout/fragment_individual_picker.xml b/res/layout/fragment_individual_picker.xml
index 11e1685..355ec0e 100755
--- a/res/layout/fragment_individual_picker.xml
+++ b/res/layout/fragment_individual_picker.xml

@@ -25,7 +25,7 @@
         android:background="@color/individual_picker_background_color"
         android:orientation="vertical">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/wallpaper_grid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

diff --git a/res/layout/fragment_preview.xml b/res/layout/fragment_preview.xml
index 5518204..a861213 100755
--- a/res/layout/fragment_preview.xml
+++ b/res/layout/fragment_preview.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:auto="http://schemas.android.com/apk/res-auto"
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:fitsSystemWindows="false">
@@ -31,14 +30,12 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <android.support.design.widget.CoordinatorLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto"
-      xmlns:auto="http://schemas.android.com/tools"
-      android:id="@+id/coordinator_layout"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="bottom">
+      <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:app="http://schemas.android.com/apk/res-auto"
+          android:id="@+id/coordinator_layout"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_gravity="bottom">
 
       <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
@@ -51,7 +48,7 @@
         android:orientation="vertical"
         android:background="@color/translucent_black"
         app:behavior_peekHeight="@dimen/preview_attribution_pane_collapsed_height"
-        app:layout_behavior="android.support.design.widget.BottomSheetBehavior">
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <LinearLayout
           android:orientation="vertical"
@@ -135,9 +132,9 @@
 
       </LinearLayout>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
       android:id="@+id/toolbar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"

diff --git a/res/layout/grid_item_single_metadata.xml b/res/layout/grid_item_single_metadata.xml
index 90ad859..376e3c2 100755
--- a/res/layout/grid_item_single_metadata.xml
+++ b/res/layout/grid_item_single_metadata.xml

@@ -26,7 +26,7 @@
     android:layout_marginTop="@dimen/single_metadata_pane_vertical_offset"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="@dimen/single_metadata_card_layout_height"
         app:cardCornerRadius="@dimen/single_metadata_card_corner_radius"
@@ -176,6 +176,6 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>

diff --git a/res/layout/section_header.xml b/res/layout/section_header.xml
new file mode 100644
index 0000000..7ca9ec0
--- /dev/null
+++ b/res/layout/section_header.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018 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.
+-->
+
+<com.google.android.material.appbar.AppBarLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:elevation="0dp">
+
+    <androidx.appcompat.widget.Toolbar
+        style="@style/RegularToolbarStyle"
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/actionBarSize"
+        android:layout_gravity="top"
+        app:layout_scrollFlags="scroll|enterAlways">
+        <TextView
+            android:id="@+id/custom_toolbar_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:textAppearance="@style/HeaderTextAppearance"/>
+    </androidx.appcompat.widget.Toolbar>
+
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c4af13c..550ee32 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Muurpapiere"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Muurpapiere"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Kies muurpapier"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Stel muurpapier"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Stel tans muurpapier …"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7f20958..ab05383 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -17,7 +17,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="5610614769724978966">"ልጣፎች"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"ልጣፎች"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"ልጣፍ ይምረጡ"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ልጣፍ ያዘጋጁ"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ልጣፍን በማዘጋጀት ላይ…"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d3f7d77..8a91483 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -17,7 +17,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="5610614769724978966">"الخلفيات"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"الخلفيات"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"اختيار خلفية"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"تعيين كخلفية"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"جارٍ تعيين الخلفية…"</string>

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index f1c6478..fe25627 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml

@@ -17,7 +17,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="5610614769724978966">"ৱালপেপাৰ"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"ৱালপেপাৰ"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"ৱালপেপাৰ বাছনি কৰক"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ৱালপেপাৰ ছেট কৰক"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ৱালপেপাৰ ছেট কৰি থকা হৈছে…"</string>
@@ -41,17 +43,17 @@
     <string name="daily_refresh_tile_title" msgid="3270456074558525091">"দৈনিক ৱালপেপাৰ"</string>
     <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"অন কৰিবলৈ টিপক"</string>
     <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"প্ৰতি দিনে ৱালপেপাৰ স্বয়ংক্ৰিয়ভাৱে সলনি হ\'ব। ছেট আপ সম্পূৰ্ণ কৰিবলৈ পৰৱৰ্তী স্ক্ৰীণত &lt;strong&gt;ৱালপেপাৰ ছেট কৰক&lt;/strong&gt;-ত টিপক।"</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"ভৱিষ্যতৰ ৱালপেপাৰসমূহ কেৱল ৱাই-ফাইৰ জৰিয়তে ডাউনল\'ড কৰক"</string>
+    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"ভৱিষ্যতৰ ৱালপেপাৰসমূহ কেৱল ৱাই-ফাইৰ জৰিয়তে ডাউনল’ড কৰক"</string>
     <string name="start_rotation_dialog_continue" msgid="276678987852274872">"অব্যাহত ৰাখক"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"প্ৰথমখন ৱালপেপাৰ ডাউনল\'ড কৰি থকা হৈছে…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"প্ৰথমখন ৱালপেপাৰ ডাউনল\'ড কৰিব পৰা নগ\'ল। অনুগ্ৰহ কৰি আপোনাৰ নেটৱর্ক ছেটিংসমূহ পৰীক্ষা কৰি আকৌ চেষ্টা কৰক।"</string>
+    <string name="start_rotation_progress_message" msgid="7872623873682262083">"প্ৰথমখন ৱালপেপাৰ ডাউনল’ড কৰি থকা হৈছে…"</string>
+    <string name="start_rotation_error_message" msgid="3053799836719618972">"প্ৰথমখন ৱালপেপাৰ ডাউনল’ড কৰিব পৰা নগ\'ল। অনুগ্ৰহ কৰি আপোনাৰ নেটৱর্ক ছেটিংসমূহ পৰীক্ষা কৰি আকৌ চেষ্টা কৰক।"</string>
     <string name="start_rotation_dialog_body" msgid="7903554799046364916">"প্ৰতি দিনে ৱালপেপাৰ স্বয়ংক্ৰিয়ভাৱে সলনি হ\'ব"</string>
     <string name="settings_button_label" msgid="8724734130079207955">"ছেটিংসমূহ"</string>
     <string name="explore" msgid="7468719504199497281">"অন্বেষণ কৰক"</string>
     <string name="next_wallpaper" msgid="3911873152952596232">"পৰৱর্তী ৱালপেপাৰ"</string>
     <string name="wallpaper_disabled_message" msgid="7309484130562148185">"ৱালপেপাৰ ছেট কৰাৰ সুবিধাটো এই ডিভাইচটোত অক্ষম থোৱা আছে"</string>
     <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"আপোনাৰ ডিভাইচৰ প্ৰশাসকে ৱালপেপাৰ ছেট কৰাৰ সুবিধাটো অক্ষম কৰি থৈছে"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"ৱালপেপাৰ সফলতাৰে ছেট কৰা হ\'ল"</string>
+    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"ৱালপেপাৰ সফলতাৰে ছেট কৰা হ’ল"</string>
     <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"ৱালপেপাৰ চাবলৈ আপোনাক ইণ্টাৰনেট সংযোগৰ প্ৰয়োজন। অনুগ্ৰহ কৰি ইণ্টাৰনেটৰ সৈতে সংযোগ কৰক আৰু আকৌ চেষ্টা কৰক।"</string>
     <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"বর্তমান ছেট কৰি থোৱা গৃহ স্ক্ৰীণৰ ৱালপেপাৰৰ থাম্বনেইল"</string>
     <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"বর্তমান ছেট কৰি থোৱা লক স্ক্ৰীণৰ ৱালপেপাৰৰ থাম্বনেইল"</string>

diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
deleted file mode 100644
index e46bf28..0000000
--- a/res/values-az-rAZ/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Divar kağızları"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Divar kağızı seçin"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Divar kağızı ayarlayın"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Divar kağızı ayarlanır..."</string>
-    <string name="try_again" msgid="8278874823700921234">"Yenidən sınayın"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Divar kağızı ayarlamaq mümkün olmadı."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Divar kağızını yükləmək olmadı. Şəkil ya zədələnib, ya da əlçatan deyil."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Hazırda ayarlanıb"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Günlük divar kağızları"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Əsas ekran"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Ekran kilidi"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Əsas səhifə və Kilid"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Divar kağı ayarlayın"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Əsas ekran"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Ekran kilidi"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Əsas səhifə ekranı və kilid ekranı"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Firlanan Şəkilli Divar Kağızları"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Burada cari divar kağızını göstərmək üçün, <xliff:g id="APP_NAME">%1$s</xliff:g> cihaz yaddaşına giriş tələb edir."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Cari divar kağızını burada göstərmək üçün Divarkağızı cihaz yaddaşına giriş tələb edir.\n\nBu ayarı dəyişmək üçün Divarkağızı tətbiqində İcazələr bölməsinə daxil olun."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Girişə icazə verin"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Fırlanan divar kağızları üçün canlı divar kağızı xidməti"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Günlük divar kağızları"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Aktiv etmək üçün tıklayın"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Divar kağızı hər gün avtomatik dəyişəcək. Ayarlamanı tamamlamaq üçün növbəti ekranda &lt;strong&gt;Divar kağızı ayarlayın&lt;/strong&gt; seçiminə klikləyin."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Gələcəkdə divar kağızlarını yalnız Wi-Fi ilə endirin"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Davam edin"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"İlk divar kağızı endirilir…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"İlk divar kağızını endirmək mümkün olmadı. Şəbəkə ayarlarınızı yoxlayın və yenidən cəhd edin."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Divar kağızları hər gün avtomatik dəyişəcək"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Ayarlar"</string>
-    <string name="explore" msgid="7468719504199497281">"Araşdırın"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Növbəti divar kağızı"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Bu cihazda divar kağızını ayarlamaq deaktiv edilib"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Divar kağızını ayarlamaq cihaz administratoru tərəfindən deaktiv edilib"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Divar kağızı ayarlandı"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Divar kağızlarını görmək üçün İnternet bağlantısı olmalıdır. Qoşulun və yenidən cəhd edin."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Hazırda ayarlanmış əsas ekran divar kağızı miniatürü"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Hazırda ayarlanmış kilid ekranı divar kağızı miniatürü"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Hazırda ayarlanmış divar kağızı miniatürü"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Divar kağızı miniatürü"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Əsas ekran divar kağızını araşdırın"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Ekran kilidi divar kağızını araşdırın"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Əsas ekranın divar kağızını gündəlik yeniləyin"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Divar kağızını gündəlik yeniləyin"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Günlük divar kağızı yenilənir..."</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Gündəlik divar kağızını yeniləmək olmadı. Şəbəkəni yoxlayın və yenidən cəhd edin."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Divar kağızı məlumat panelini yiğcamlaşdırın"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Divar kağızı məlumat panelini genişləndirin"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Cihazdakı divar kağızları"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Cihazda"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android divar kağızı"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Canlı divar kağızları"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Fotolarım"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Fotom"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Divar kağızı"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Tətbiq quraşdırılmayıb."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Mərkəz"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Mərkəzi kəsim"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Dartın"</string>
-</resources>

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index e46bf28..9df06f6 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Divar kağızları"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Divar kağızları"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Divar kağızı seçin"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Divar kağızı ayarlayın"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Divar kağızı ayarlanır..."</string>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index f28d32e..35462dd 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Pozadine"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Pozadine"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Izaberite pozadinu"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Podesi pozadinu"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Podešava se pozadina…"</string>

diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
deleted file mode 100644
index 0cfda2b..0000000
--- a/res/values-be-rBY/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Шпалеры"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Выберыце шпалеры"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Усталяваць як шпалеры"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Усталяванне шпалер…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Паўтарыць спробу"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Не ўдалося ўсталяваць як шпалеры."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Немагчыма загрузіць шпалеры. Відарыс пашкоджаны або недаступны."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Усталяванае як шпалеры"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Шпалеры на кожны дзень"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Галоўны экран"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Экран блакіроўкі"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Стандартна"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Усталяваць як шпалеры"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Галоўны экран"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Экран блакіроўкі"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Галоўны экран і экран блакіроўкі"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Рэгулярная змена шпалер"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Каб паглядзець бягучыя шпалеры тут, дайце праграме \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" доступ да сховішча прылады."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Каб паглядзець бягучыя шпалеры тут, дайце праграме \"Шпалеры\" доступ да сховішча прылады.\n\nЗакрыць доступ можна, перайшоўшы ў \"Налады &gt; Праграмы &gt; Шпалеры &gt; Дазволы\"."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Дазволіць доступ"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Служба жывых шпалер для іх рэгулярнай змены"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Шпалеры на кожны дзень"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Націсніце, каб уключыць"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Шпалеры будуць аўтаматычна змяняцца кожны дзень. Для завяршэння наладжвання, націсніце &lt;strong&gt;Усталяваць як шпалеры&lt;/strong&gt; на наступным экране."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"У будучыні спампоўваць шпалеры толькі па Wi-Fi"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Працягнуць"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Спампоўка першых шпалер…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Не ўдалося спампаваць першыя шпалеры. Спраўдзіце налады сеткі і паўтарыце спробу."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Шпалеры будуць аўтаматычна змяняцца кожны дзень"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Налады"</string>
-    <string name="explore" msgid="7468719504199497281">"Агляд"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Наступныя шпалеры"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"На гэтай прыладзе нельга мяняць шпалеры"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Усталяванне шпалер адключана адміністратарам прылады"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Шпалеры захаваныя"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Для прагляду шпалер патрабуецца падключэнне да інтэрнэту. Падключыцеся і паўтарыце спробу."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Мініяцюра шпалер, зададзеных для галоўнага экрана"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Мініяцюра шпалер, зададзеных для экрана блакіроўкі"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Мініяцюра зададзеных шпалер"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Мініяцюра шпалер"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Праглядзець шпалеры галоўнага экрана"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Праглядзець шпалеры экрана блакіроўкі"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Абнавіць шпалеры галоўнага экрана на кожны дзень"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Абнавіць шпалеры на кожны дзень"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Абнаўленне шпалер на кожны дзень…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Не атрымалася абнавіць шпалеры на кожны дзень. Спраўдзіце падключэнне да сеткі і паўтарыце спробу."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Згарнуць панэль інфармацыі пра шпалеры"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Разгарнуць панэль інфармацыі пра шпалеры"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Шпалеры на прыладзе"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"На прыладзе"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Шпалеры Android"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Жывыя шпалеры"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Мае фота"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Маё фота"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Шпалеры"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Праграма не ўсталявана."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Размясціць па цэнтры"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Запоўніць"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Расцягнуць"</string>
-</resources>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0cfda2b..7907583 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Шпалеры"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Шпалеры"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Выберыце шпалеры"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Усталяваць як шпалеры"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Усталяванне шпалер…"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cbbdd96..4f93889 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Тапети"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Тапети"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Изберете тапет"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Задаване на тапета"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Тапетът се задава…"</string>

diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
deleted file mode 100644
index 7f65c14..0000000
--- a/res/values-bn-rBD/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"ওয়ালপেপার"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"ওয়ালপেপার বেছে নিন"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ওয়ালপেপার সেট করুন"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ওয়ালপেপার সেট করা হচ্ছে…"</string>
-    <string name="try_again" msgid="8278874823700921234">"আবার চেষ্টা করুন"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"ওয়ালপেপার সেট করা গেল না।"</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"ওয়ালপেপার লোড করা গেল না। ছবিটি হয়ত খারাপ হয়ে গেছে বা সেটি উপলভ্য নয়।"</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"বর্তমানে সেট করা রয়েছে"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"প্রতিদিনের ওয়ালপেপার"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"হোম স্ক্রিন"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"লক স্ক্রিন"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"হোম ও লক"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"ওয়ালপেপার সেট করুন"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"হোম স্ক্রিন"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"লক স্ক্রিন"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"হোম স্ক্রিন ও লক স্ক্রিন"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"নির্দিষ্ট সময় অন্তর একই ছবি দেখানোর ওয়ালপেপার"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"বর্তমানে বেছে নেওয়া ওয়ালপেপারটি এখানে ডিসপ্লে করার জন্য <xliff:g id="APP_NAME">%1$s</xliff:g>-কে আপনার ডিভাইসের স্টোরেজে অ্যাক্সেস দিতে হবে।"</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"বর্তমান ওয়ালপেপারটি এখানে দেখাতে হলে ওয়ালপেপার অ্যাপটিকে আপনার ডিভাইসের স্টোরেজে অ্যাক্সেস দিতে হবে।\n\nএই সেটিংটি পরিবর্তন করতে ওয়ালপেপার অ্যাপের তথ্যের পৃষ্ঠায় \'অনুমতি\' বিভাগে যান।"</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"অ্যাক্সেস দিন"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"নির্দিষ্ট সময় অন্তর একই ওয়ালপেপার দেখানোর জন্য লাইভ ওয়ালপেপার পরিষেবা"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"প্রতিদিনের ওয়ালপেপার"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"চালু করতে ট্যাপ করুন"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"ওয়ালপেপার প্রতিদিন নিজে থেকে পরিবর্তিত হবে। সেট-আপ সম্পন্ন করতে, পরবর্তী স্ক্রিনে &lt;strong&gt;ওয়ালপেপার সেট করুন&lt;/strong&gt; বিকল্পে ট্যাপ করুন।"</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"পরবর্তী ওয়ালপেপারগুলিকে শুধুমাত্র ওয়াই-ফাইয়ের মাধ্যমে ডাউনলোড করুন"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"এগিয়ে যান"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"প্রথম ওয়ালপেপারটিকে ডাউনলোড করা হচ্ছে…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"প্রথম ওয়ালপেপারটিকে ডাউনলোড করা গেল না। অনুগ্রহ করে আপনার নেটওয়ার্ক সেটিংস পরীক্ষা করে আবার চেষ্টা করুন।"</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"ওয়ালপেপার প্রতিদিন নিজে থেকে পরিবর্তিত হবে"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"সেটিংস"</string>
-    <string name="explore" msgid="7468719504199497281">"ঘুরে দেখুন"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"পরবর্তী ওয়ালপেপার"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"ওয়ালপেপার সেট করার বৈশিষ্ট্যটি এই ডিভাইসে বন্ধ করা আছে"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"আপনার ডিভাইসের অ্যাডমিনিস্ট্রেটর ওয়ালপেপার সেট করার বৈশিষ্ট্যটি বন্ধ করেছেন"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"ওয়ালপেপার সেট করা হয়েছে"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"ওয়ালপেপারগুলি দেখতে আপনার ইন্টারনেট কানেকশন প্রয়োজন। কানেক্ট করে আবার চেষ্টা করুন।"</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"বর্তমানে সেট করা হোম স্ক্রিন ওয়ালপেপারের থাম্বনেল"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"বর্তমানে সেট করা লক স্ক্রিন ওয়ালপেপারের থাম্বনেল"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"বর্তমানে সেট করা ওয়ালপেপারের থাম্বনেল"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"ওয়ালপেপারের থাম্বনেল"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"হোম স্ক্রিন ওয়ালপেপার ঘুরে দেখুন"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"লক স্ক্রিন ওয়ালপেপার ঘুরে দেখুন"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"প্রতিদিনের হোম স্ক্রিন ওয়ালপেপার রিফ্রেশ করুন"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"প্রতিদিনের ওয়ালপেপার রিফ্রেশ করুন"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"প্রতিদিনের ওয়ালপেপার রিফ্রশ করা হচ্ছে…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"প্রতিদিনের ওয়ালপেপার রিফ্রেশ করা গেল না। অনুগ্রহ করে আপনার কানেকশন যাচাই করে আবার চেষ্টা করুন।"</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"ওয়ালপেপার তথ্যের প্যানেলকে আড়াল করুন"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"ওয়ালপেপার তথ্যের প্যানেলকে বড় করুন"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"ডিভাইসে থাকা ওয়ালপেপার"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"ডিভাইসে রয়েছে"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android-এর ওয়ালপেপার"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"লাইভ ওয়ালপেপার"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"আমার ফটো"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"আমার ফটো"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"ওয়ালপেপার"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"অ্যাপ ইনস্টল করা নেই।"</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"মাঝখানে"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"সীমানার দিকে কাটছাঁট করা"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"প্রসারিত"</string>
-</resources>

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 7f65c14..98528d2 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml

@@ -17,7 +17,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="5610614769724978966">"ওয়ালপেপার"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"ওয়ালপেপার"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"ওয়ালপেপার বেছে নিন"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ওয়ালপেপার সেট করুন"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ওয়ালপেপার সেট করা হচ্ছে…"</string>

diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
deleted file mode 100644
index 9c61b1c..0000000
--- a/res/values-bs-rBA/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Pozadinske slike"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Odaberite pozadinsku sliku"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Postavi pozadinsku sliku"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Postavljanje pozadinske slike…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Pokušaj ponovo"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Nije moguće postaviti pozadinsku sliku."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Nije moguće učitati pozadinsku sliku. Slika je oštećena ili nije dostupna."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Trenutno se koristi"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Dnevna pozadinska slika"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Početni ekran"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Zaključavanje ekrana"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Početni i zaključani ekran"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Postavi pozadinsku sliku"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Početni ekran"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Zaključavanje ekrana"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Početni ekran i zaključavanje ekrana"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Smjenjivanje pozadinskih slika"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Da ovdje prikažete trenutne pozadinske slike, aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> treba pristup pohrani na vašem uređaju."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Da ovdje prikažete trenutne pozadinske slike, aplikaciji Pozadinske slike treba pristup pohrani na vašem uređaju.\n\nZa promjenu postavke, u informacijama o aplikaciji Pozadinske slike idite u odjeljak Odobrenja."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Dozvoli pristup"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Usluga žive pozadinske slike za smjenjivanje pozadinskih slika"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Dnevna pozadinska slika"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Dodirnite da uključite"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Pozadinska slika će se automatski mijenjati svakodnevno. Da završite postavljanje, na sljedećem ekranu dodirnite &lt;strong&gt;Postavi pozadinsku sliku&lt;/strong&gt;."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Preuzimaj nove pozadinske slike samo putem WiFi mreže"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Nastavi"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Preuzimanje prve pozadinske slike…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Nije moguće preuzeti prvu pozadinsku sliku. Provjerite postavke mreže i pokušajte ponovo."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Pozadinska slika će se automatski mijenjati svakodnevno"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Postavke"</string>
-    <string name="explore" msgid="7468719504199497281">"Istraži"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Sljedeća pozadinska slika"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Postavljanje pozadinske slike je onemogućeno na ovom uređaju"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Postavljanje pozadinske slike je onemogućio administrator vašeg uređaja"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Pozadinska slika je uspješno postavljena"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Treba vam internetska veza da pregledate pozadinske slike. Povežite se i pokušajte ponovo."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Sličica trenutne pozadinske slike početnog ekrana"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Sličica trenutne pozadinske slike zaključanog ekrana"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Sličica trenutne pozadinske slike"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Sličica pozadinske slike"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Istražite pozadinske slike početnog ekrana"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Istražite pozadinske slike zaključanog ekrana"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Osvježite dnevnu pozadinsku sliku na početnom ekranu"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Osvježite dnevnu pozadinsku sliku"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Osvježavanje dnevne pozadinske slike…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Osvježavanje dnevne pozadinske slike nije uspjelo. Provjerite vezu s mrežom i pokušajte ponovo."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Suzite podatke o pozadinskoj slici"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Prikažite podatke o pozadinskoj slici"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Pozadinske slike na uređaju"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Na uređaju"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android pozadinska slika"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Žive pozadinske slike"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Moje fotografije"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Moja fotografija"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Pozadinska slika"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Aplikacija nije instalirana."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Sredina"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Sredina s odrezanim rubovima"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Razvučeno"</string>
-</resources>

diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 9c61b1c..cf64412 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Pozadinske slike"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Pozadinske slike"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Odaberite pozadinsku sliku"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Postavi pozadinsku sliku"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Postavljanje pozadinske slike…"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fe591aa..1759a67 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Fons de pantalla"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Fons de pantalla"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Selecciona un fons de pantalla"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Estableix el fons de pantalla"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"S\'està establint el fons de pantalla…"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5bb9d69..fd57881 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Tapety"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Tapety"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Výběr tapety"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Nastavit jako tapetu"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Nastavování tapety…"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 23d20cd..5add57c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Baggrunde"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Baggrunde"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Vælg baggrund"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Angiv baggrund"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Angiver baggrund…"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3fd048c..d88eece 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Hintergründe"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Hintergründe"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Hintergrund auswählen"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Als Hintergrund festlegen"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Hintergrund wird festgelegt…"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0c11fa8..30807f5 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Ταπετσαρίες"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Ταπετσαρίες"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Επιλογή ταπετσαρίας"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Ορισμός ταπετσαρίας"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Ορισμός ταπετσαρίας…"</string>

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index f332ccd..01cd559 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Wallpapers"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Wallpapers"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Select wallpaper"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Set Wallpaper"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Setting wallpaper…"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f332ccd..01cd559 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Wallpapers"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Wallpapers"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Select wallpaper"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Set Wallpaper"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Setting wallpaper…"</string>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f332ccd..01cd559 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Wallpapers"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Wallpapers"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Select wallpaper"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Set Wallpaper"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Setting wallpaper…"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5362556..d565340 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Fondos de pantalla"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Fondos de pantalla"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Seleccionar el fondo de pantalla"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Definir como fondo de pantalla"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Estableciendo como fondo de pantalla…"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5b86f8a..4368d30 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -17,14 +17,16 @@
 
 <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="5610614769724978966">"Fondos de pantalla"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Fondos de pantalla"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Selecciona un fondo de pantalla"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Establecer fondo de pantalla"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Estableciendo fondo de pantalla…"</string>
     <string name="try_again" msgid="8278874823700921234">"Reintentar"</string>
     <string name="set_wallpaper_error_message" msgid="6819986999041085130">"No se puede establecer el fondo de pantalla."</string>
     <string name="load_wallpaper_error_message" msgid="7913278480467707374">"No se puede cargar el fondo de pantalla. La imagen no está disponible o está dañada."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"En uso"</string>
+    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Configurado actualmente"</string>
     <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Fondo de pantalla diario"</string>
     <string name="home_screen_message" msgid="106444102822522813">"Pantalla de inicio"</string>
     <string name="lock_screen_message" msgid="1534506081955058013">"Pantalla de bloqueo"</string>

diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
deleted file mode 100644
index fc53a4c..0000000
--- a/res/values-et-rEE/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Taustapildid"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Taustapildi valimine"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Määra taustapilt"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Taustapildi määramine …"</string>
-    <string name="try_again" msgid="8278874823700921234">"Proovi uuesti"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Taustapilti ei saa määrata."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Taustapilti ei saa laadida. Pilt on rikutud või pole saadaval."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Praegu määratud"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Päeva taustapilt"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Avaekraan"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Lukustuskuva"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Avaekraan ja lukustuskuva"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Taustapildi määramine"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Avaekraan"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Lukustuskuva"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Avaekraan ja lukustuskuva"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Vahelduva kujutisega taustapilt"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Kui soovite praeguse taustapildi kuvada siin, vajab rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> juurdepääsu teie seadme salvestusruumile."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Kui soovite praeguse taustapildi kuvada siin, vajab rakendus Taustapildid juurdepääsu teie seadme salvestusruumile.\n\nSelle seade muutmiseks avage rakenduse Taustapildid teabe juures jaotis Load."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Luba juurdepääs"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Dünaamilise taustapildi teenus vahelduvatele taustapiltidele"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Päeva taustapilt"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Puudutage sisselülitamiseks"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Taustapilt vahetub automaatselt iga päev. Seadistamise lõpetamiseks puudutage järgmisel ekraanikuval käsku &lt;strong&gt;Määra taustapildiks&lt;/strong&gt;."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Tulevased taustapildid laaditakse alla ainult WiFi-ühenduse korral"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Jätka"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Esimese taustapildi allalaadimine …"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Esimest taustapilti ei saa alla laadida. Kontrollige võrguseadeid ja proovige uuesti."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Taustapilt vahetub automaatselt iga päev"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Seaded"</string>
-    <string name="explore" msgid="7468719504199497281">"Avastage"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Järgmine taustapilt"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Taustapildi määramine on selles seadmes keelatud"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Seadme administraator on taustapildi määramise keelanud"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Taustapildi määramine õnnestus"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Taustapiltide nägemiseks vajate Interneti-ühendust. Looge ühendus ja proovige uuesti."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Praegu määratud avaekraani taustapildi pisipilt"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Praegu määratud lukustuskuva taustapildi pisipilt"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Praegu määratud taustapildi pisipilt"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Taustapildi pisipilt"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Avaekraani taustapildi avastamine"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Lukustuskuva taustapildi avastamine"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Avaekraani päeva taustapildi värskendamine"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Päeva taustapildi värskendamine"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Päeva taustapildi värskendamine …"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Päeva taustapildi värskendamine ebaõnnestus. Kontrollige võrguühendust ja proovige uuesti."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Taustapildi teabepaneeli ahendamine"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Taustapildi teabepaneeli laiendamine"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Seadmes olevad taustapildid"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Seadmes"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Androidi taustapilt"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Dünaamilised taustapildid"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Minu fotod"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Minu foto"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Taustapilt"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Rakendus pole installitud."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Keskele"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Keskele kärpimine"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Venitamine"</string>
-</resources>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index fc53a4c..a8fb28f 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Taustapildid"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Taustapildid"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Taustapildi valimine"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Määra taustapilt"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Taustapildi määramine …"</string>

diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
deleted file mode 100644
index c2f8beb..0000000
--- a/res/values-eu-rES/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Horma-paperak"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Hautatu horma-papera"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Ezarri horma-papera"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Horma-papera ezartzen…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Saiatu berriro"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Ezin da ezarri horma-papera."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Ezin da kargatu horma-papera. Irudia hondatuta dago edo ezin da eskuratu."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Ezarrita dago"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Eguneko horma-papera"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Hasierako pantaila"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Pantaila blokeatua"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Hasieran + pantaila blokeatuan"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Ezarri horma-papera"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Hasierako pantaila"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Pantaila blokeatua"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Hasierako pantaila eta pantaila blokeatua"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Txandakako irudidun horma-papera"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Uneko horma-papera hemen bistaratzeko, zure gailuaren memoria atzitu behar du <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Uneko horma-papera hemen ager dadin, gailuaren memoriarako sarbidea behar du Horma-paperak aplikazioak.\n\nEzarpena aldatzeko, joan Horma-paperak aplikazioaren informazioko Baimenak atalera."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Eman baimena"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Txandakako irudietarako horma-paper dinamikoen zerbitzua"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Eguneko horma-papera"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Sakatu aktibatzeko"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Horma-papera automatikoki aldatuko da egunero. Konfiguratzen amaitzeko, hurrengo pantailan, sakatu &lt;strong&gt;Ezarri horma-papera&lt;/strong&gt;."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Aurrerantzean, deskargatu Wi-Fi bidez soilik horma-paperak"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Egin aurrera"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Lehen horma-papera deskargatzen…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Ezin da deskargatu lehen horma-papera. Egiaztatu sarearen ezarpenak zuzenak direla eta saiatu berriro."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Horma-papera automatikoki aldatuko da egunero"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Ezarpenak"</string>
-    <string name="explore" msgid="7468719504199497281">"Arakatu"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Hurrengo horma-papera"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Gailu honetan desgaituta dago horma-papera ezartzeko aukera"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Gailuaren administratzaileak desgaituta dauka horma-papera ezartzeko aukera"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Ezarri da horma-papera"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Internetera konektatu behar duzu horma-paperak ikusteko. Konekta zaitez eta saiatu berriro."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Hasierako pantailan ezarrita dagoen horma-paperaren irudi txikia"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Pantaila blokeatuan ezarrita dagoen horma-paperaren irudi txikia"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Ezarrita dagoen horma-paperaren irudi txikia"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Horma-paperaren irudi txikia"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Arakatu hasierako pantailaren horma-papera"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Arakatu pantaila blokeatuaren horma-papera"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Freskatu hasierako pantailaren eguneko horma-papera"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Freskatu eguneko horma-papera"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Eguneko horma-papera freskatzen…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Ezin izan da freskatu eguneko horma-papera. Egiaztatu sarera konektatuta zaudela eta saiatu berriro."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Tolestu horma-paperari buruzko informazioaren panela"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Zabaldu horma-paperari buruzko informazioaren panela"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Gailuko horma-paperak"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Gailukoak"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android horma-papera"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Horma-paper dinamikoak"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Nire argazkiak"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Nire argazkia"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Horma-papera"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Ez dago instalatuta aplikazio hori."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Erdian"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Erdian, moztuta"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Pantailara egokituta"</string>
-</resources>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c2f8beb..c1e1587 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Horma-paperak"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Horma-paperak"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Hautatu horma-papera"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Ezarri horma-papera"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Horma-papera ezartzen…"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 218c676..0ac08b5 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -17,7 +17,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="5610614769724978966">"کاغذدیواری"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"کاغذدیواری"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"انتخاب کاغذ‌دیواری"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"تنظیم کاغذ‌دیواری"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"در حال تنظیم کاغذدیواری..."</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 7e44a23..105064f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Taustakuvat"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Taustakuvat"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Valitse taustakuva"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Aseta taustakuva"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Asetetaan taustakuvaa…"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f89992e..ed9d5a1 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Fonds d\'écran"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Fonds d\'écran"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Sélectionnez un fond d\'écran"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Définir le fond d\'écran"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Définition du fond d\'écran en cours…"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1d05288..ea64132 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Fonds d\'écran"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Fonds d\'écran"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Sélectionner un fond d\'écran"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Définir comme fond d\'écran"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Définition du fond d\'écran…"</string>

diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
deleted file mode 100644
index 8745c2b..0000000
--- a/res/values-gl-rES/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Fondos de pantalla"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Selecciona un fondo de pantalla"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Establecer fondo de pantalla"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Establecendo fondo de pantalla…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Tentar de novo"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Non se puido establecer o fondo de pantalla."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Non se puido cargar o fondo de pantalla. A imaxe está danada ou non está dispoñible."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Establecido actualmente"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Fondo de pantalla diario"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Pantalla de inicio"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Pantalla de bloqueo"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Pantallas de inicio e bloqueo"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Establecer fondo de pantalla"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Pantalla de inicio"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Pantalla de bloqueo"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Pantalla de inicio e pantalla de bloqueo"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Fondo de pantalla con imaxes que rotan"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Para mostrar aquí o fondo de pantalla actual, <xliff:g id="APP_NAME">%1$s</xliff:g> necesita acceso ao almacenamento do dispositivo."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Para mostrar aquí o fondo de pantalla actual, a aplicación Fondos de pantalla necesita acceso ao almacenamento do dispositivo.\n\nPara cambiar esta opción de configuración, accede á área de permisos de información da aplicación Fondos de pantalla."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Permitir acceso"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Servizo de fondo de pantalla animado para fondos de pantalla que rotan"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Fondo de pantalla diario"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Toca para activar a función"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"O fondo de pantalla cambiará automaticamente a diario. Para finalizar a configuración, toca &lt;strong&gt;Establecer fondo de pantalla&lt;/strong&gt; na seguinte pantalla."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Descargar próximos fondos de pantalla só coa wifi"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Continuar"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Descargando primeiro fondo de pantalla…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Non se puido descargar o primeiro fondo de pantalla. Comproba a configuración de rede e téntao de novo."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"O fondo de pantalla cambiará automaticamente a diario"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Configuración"</string>
-    <string name="explore" msgid="7468719504199497281">"Explorar"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Seguinte fondo de pantalla"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Desactivouse a opción de establecer un fondo de pantalla neste dispositivo"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"O administrador do teu dispositivo desactivou a opción de establecer un fondo de pantalla."</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"O fondo de pantalla estableceuse correctamente"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Necesitas conexión a Internet para ver fondos de pantalla. Conéctate e téntao de novo."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Miniatura do fondo de pantalla para a pantalla de inicio establecido actualmente"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Miniatura do fondo de pantalla para a pantalla de bloqueo establecido actualmente"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Miniatura do fondo de pantalla establecido actualmente"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Miniatura do fondo de pantalla"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Explora o fondo de pantalla para a pantalla de inicio"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Explora o fondo de pantalla para a pantalla de bloqueo"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Actualiza o fondo de pantalla diario para a pantalla de inicio"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Actualiza o fondo de pantalla diario"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Actualizando fondo de pantalla diario…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Produciuse un erro ao actualizar o fondo de pantalla diario. Comproba a conexión de rede e téntao de novo."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Contrae o panel de información do fondo de pantalla"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Desprega o panel de información do fondo de pantalla"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Fondos no dispositivo"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"No dispositivo"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Fondo de pantalla de Android"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Fondos de pantalla animados"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"As miñas fotos"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"A miña foto"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Fondo de pantalla"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"A aplicación non está instalada."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Centro"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Recortar no centro"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Estirar"</string>
-</resources>

diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 8745c2b..2d0cf91 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Fondos de pantalla"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Fondos de pantalla"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Selecciona un fondo de pantalla"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Establecer fondo de pantalla"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Establecendo fondo de pantalla…"</string>

diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
deleted file mode 100644
index 299385a..0000000
--- a/res/values-gu-rIN/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"વૉલપેપર"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"વૉલપેપર પસંદ કરો"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"વૉલપેપર સેટ કરો"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"વૉલપેપર સેટ કરી રહ્યાં છીએ…"</string>
-    <string name="try_again" msgid="8278874823700921234">"ફરી પ્રયાસ કરો"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"વૉલપેપર સેટ કરવામાં અસમર્થ છીએ."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"વૉલપેપર લોડ કરવામાં અસમર્થ છીએ. છબી કાં તો દૂષિત છે અથવા તો અનુપલબ્ધ છે."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"વર્તમાનમાં સેટ વૉલપેપર"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"દૈનિક વૉલપેપર"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"હોમ સ્ક્રીન"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"લૉક સ્ક્રીન"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"હોમ અને લૉક"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"વૉલપેપર સેટ કરો"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"હોમ સ્ક્રીન"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"લૉક સ્ક્રીન"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"હોમ સ્ક્રીન અને લૉક સ્ક્રીન"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"સતત બદલાતા રહેતા છબી વૉલપેપર"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"વર્તમાન વૉલપેપરને અહીં પ્રદર્શિત કરવા માટે, <xliff:g id="APP_NAME">%1$s</xliff:g>ને તમારા ઉપકરણના સ્ટોરેજનો ઍક્સેસ જરૂરી છે."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"વર્તમાન વૉલપેપરને અહીં પ્રદર્શિત કરવા માટે, વૉલપેપરને તમારા ઉપકરણના સ્ટોરેજનો ઍક્સેસ જરૂરી છે.\n\nઆ સેટિંગ બદલવા માટે, વૉલપેપર ઍપની માહિતીના પરવાનગીઓ વિભાગમાં જાઓ."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"ઍક્સેસની મંજૂરી આપો"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"સતત બદલાતા રહેતા વૉલપેપર માટે લાઇવ વૉલપેપર સેવા"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"દૈનિક વૉલપેપર"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"ચાલુ કરવા માટે ટૅપ કરો"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"વૉલપેપર દરરોજ આપમેળે બદલાશે. સેટઅપ પૂર્ણ કરવા માટે, આગલી સ્ક્રીન પર &lt;strong&gt;વૉલપેપર સેટ કરો&lt;/strong&gt; પર ટૅપ કરો."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"ભવિષ્યમાં માત્ર વાઇ-ફાઇ પર વૉલપેપર ડાઉનલોડ કરજો"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"આગળ વધો"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"પ્રથમ વૉલપેપર ડાઉનલોડ કરી રહ્યાં છીએ…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"પ્રથમ વૉલપેપર ડાઉનલોડ કરવામાં અસમર્થ રહ્યાં. કૃપા કરીને તમારી નેટવર્ક સેટિંગ ચેક કરો અને ફરી પ્રયાસ કરો."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"વૉલપેપર દરરોજ આપમેળે બદલાશે"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"સેટિંગ"</string>
-    <string name="explore" msgid="7468719504199497281">"શોધખોળ કરો"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"આગલું વૉલપેપર"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"આ ઉપકરણ પર વૉલપેપર સેટ કરવાની સુવિધા બંધ કરવામાં આવી છે"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"તમારા ઉપકરણ વ્યવસ્થાપકે વૉલપેપર સેટ કરવાની સુવિધા બંધ કરી છે"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"વૉલપેપર સફળતાપૂર્વક સેટ કર્યું"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"વૉલપેપર જોવા માટે તમારે ઇન્ટરનેટ કનેક્શન જરૂરી છે. કૃપા કરીને કનેક્ટ કરો અને ફરી પ્રયાસ કરો."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"હોમ સ્ક્રીન વૉલપેપરની વર્તમાનમાં સેટ થંબનેલ"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"લૉક સ્ક્રીન વૉલપેપરની વર્તમાનમાં સેટ થંબનેલ"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"વૉલપેપરની વર્તમાનમાં સેટ થંબનેલ"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"વૉલપેપરની થંબનેલ"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"હોમ સ્ક્રીન વૉલપેપર માટે શોધખોળ કરો"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"લૉક સ્ક્રીન વૉલપેપર માટે શોધખોળ કરો"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"દૈનિક હોમ સ્ક્રીન વૉલપેપર રિફ્રેશ કરો"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"દૈનિક વૉલપેપર રિફ્રેશ કરો"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"દૈનિક વૉલપેપર રિફ્રેશ કરી રહ્યાં છીએ…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"દૈનિક વૉલપેપર રિફ્રેશ કરવામાં નિષ્ફળ રહ્યાં. કૃપા કરીને તમારું નેટવર્ક કનેક્શન ચેક કરો અને ફરી પ્રયાસ કરો."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"વૉલપેપર માહિતી પૅનલ સંકુચિત કરો"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"વૉલપેપર માહિતી પૅનલ વિસ્તૃત કરો"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"ઉપકરણ પરના વૉલપેપર"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"ઉપકરણ પર"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android વૉલપેપર"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"લાઇવ વૉલપેપર"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"મારા ફોટા"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"મારો ફોટો"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"વૉલપેપર"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"ઍપ ઇન્સ્ટૉલ કરવામાં આવી નથી."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"મધ્ય"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"મધ્યમાંથી કાપેલ"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ખેંચેલ"</string>
-</resources>

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 299385a..e5928a0 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml

@@ -17,14 +17,16 @@
 
 <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="5610614769724978966">"વૉલપેપર"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"વૉલપેપર"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"વૉલપેપર પસંદ કરો"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"વૉલપેપર સેટ કરો"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"વૉલપેપર સેટ કરી રહ્યાં છીએ…"</string>
     <string name="try_again" msgid="8278874823700921234">"ફરી પ્રયાસ કરો"</string>
     <string name="set_wallpaper_error_message" msgid="6819986999041085130">"વૉલપેપર સેટ કરવામાં અસમર્થ છીએ."</string>
     <string name="load_wallpaper_error_message" msgid="7913278480467707374">"વૉલપેપર લોડ કરવામાં અસમર્થ છીએ. છબી કાં તો દૂષિત છે અથવા તો અનુપલબ્ધ છે."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"વર્તમાનમાં સેટ વૉલપેપર"</string>
+    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"સેટ કરેલું વૉલપેપર"</string>
     <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"દૈનિક વૉલપેપર"</string>
     <string name="home_screen_message" msgid="106444102822522813">"હોમ સ્ક્રીન"</string>
     <string name="lock_screen_message" msgid="1534506081955058013">"લૉક સ્ક્રીન"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a065443..ab00456 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -17,7 +17,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="5610614769724978966">"वॉलपेपर"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"वॉलपेपर"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"वॉलपेपर चुनें"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"वॉलपेपर सेट करें"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"वॉलपेपर सेट किया जा रहा है…"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 7011da6..006cd9f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Pozadine"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Pozadine"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Odaberite pozadinu"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Postavi pozadinu"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Postavljanje pozadine…"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1744a3e..23094f5 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Háttérképek"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Háttérképek"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Háttérkép kiválasztása"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Háttérkép beállítása"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Háttérkép beállítása…"</string>

diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
deleted file mode 100644
index 0a04ce8..0000000
--- a/res/values-hy-rAM/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Պաստառներ"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Ընտրեք պաստառը"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Օգտագործել որպես պաստառ"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Պաստառը տեղադրվում է…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Նորից փորձել"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Չհաջողվեց տեղադրել պաստառը:"</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Չհաջողվեց բեռնել պաստառը: Պատկերը կամ վնասված է, կամ հասանելի չէ:"</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Ընթացիկ պաստառ"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Օրվա պաստառ"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Հիմնական էկրան"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Կողպէկրան"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Հիմնական էկրան և կողպէկրան"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Օգտագործել որպես պաստառ"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Հիմնական էկրան"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Կողպէկրան"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Հիմնական էկրան և կողպէկրան"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Փոխվող պատկերներով պաստառ"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Ընթացիկ պաստառն այստեղ տեսնելու համար թույլատրեք «<xliff:g id="APP_NAME">%1$s</xliff:g>» հավելվածին օգտագործել սարքի հիշողությունը։"</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Ընթացիկ պաստառն այստեղ տեսնելու համար թույլատրեք «Պաստառներ» հավելվածին օգտագործել սարքի հիշողությունը:\n\nԱյս կարգավորումը փոխելու համար անցեք Կարգավորումներ &gt; Հավելվածներ &gt; Պաստառներ &gt; Թույլտվություններ։"</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Թույլատրել"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Կենդանի պաստառի ծառայություն փոխվող պաստառների համար"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Օրվա պաստառ"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Հպեք՝ միացնելու համար"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Պաստառն ամեն օր ավտոմատ կփոխվի։ Կարգավորումն ավարտելու համար հաջորդ էկրանին հպեք &lt;strong&gt;Տեղադրել պաստառը&lt;/strong&gt; կոճակին:"</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Հետագայում պաստառները ներբեռնել միայն Wi-Fi-ով"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Շարունակել"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Ներբեռնվում է առաջին պաստառը…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Չհաջողվեց ներբեռնել առաջին պաստառը: Ստուգեք ցանցային կարգավորումները, ապա նորից փորձեք:"</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Պաստառն ամեն օր ավտոմատ կփոխվի"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Կարգավորումներ"</string>
-    <string name="explore" msgid="7468719504199497281">"Ուսումնասիրել"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Հաջորդ պաստառը"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Այս սարքում հնարավոր չէ պաստառ տեղադրել"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Ադմինիստրատորն անջատել է պաստառ տեղադրելու հնարավորությունը"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Պաստառը տեղադրվեց"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Պաստառները դիտելու համար անհրաժեշտ է ինտերնետ կապ: Միացեք ինտերնետին և փորձեք նորից:"</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Հիմնական էկրանի ընթացիկ պաստառի մանրապատկեր"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Կողպէկրանի ընթացիկ պաստառի մանրապատկեր"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Ընթացիկ պաստառի մանրապատկեր"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Պաստառի մանրապատկեր"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Ուսումնասիրել հիմնական էկրանի պաստառը"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Ուսումնասիրել կողպէկրանի պաստառը"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Թարմացնել հիմնական էկրանի օրվա պաստառը"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Թարմացնել օրվա պաստառը"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Օրվա պաստառը թարմացվում է…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Չհաջողվեց թարմացնել օրվա պաստառը: Ստուգեք ինտերնետ կապը և նորից փորձեք:"</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Թաքցնել պաստառի տվյալների վահանակը"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Ընդարձակել պաստառի տվյալների վահանակը"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Սարքում պահված պաստառներ"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Սարքում պահված"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android պաստառ"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Կենդանի պաստառներ"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Իմ լուսանկարները"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Իմ լուսանկարը"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Պաստառ"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Հավելվածը տեղադրված չէ:"</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Կենտրոնում"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Կենտրոնում, կտրած"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Ձգել"</string>
-</resources>

diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 26090d7..541ab53 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Պաստառներ"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Պաստառներ"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Ընտրեք պաստառը"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Օգտագործել որպես պաստառ"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Պաստառը տեղադրվում է…"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bf84bc3..11082ae 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Wallpaper"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Wallpaper"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Pilih wallpaper"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Setel Wallpaper"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Menyetel wallpaper…"</string>

diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
deleted file mode 100644
index 58f726d..0000000
--- a/res/values-is-rIS/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Veggfóður"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Veldu veggfóður"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Velja veggfóður"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Vistar sem veggfóður…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Reyna aftur"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Ekki hægt að vista sem veggfóður."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Ekki tókst að hlaða veggfóður. Myndin er annaðhvort skemmd eða ekki tiltæk."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Valið núna"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Daglegt veggfóður"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Heimaskjár"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Lásskjár"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Heima- og lásskjár"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Velja veggfóður"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Heimaskjár"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Lásskjár"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Heimaskjár og lásskjár"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Breytilegt veggfóður"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Til að birta núverandi veggfóður hér þarf <xliff:g id="APP_NAME">%1$s</xliff:g> aðgang að geymslu tækisins."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Veggfóður þarf að fá aðgang að geymslu tækisins þíns til að birta þetta veggfóður hér.\n\nTil að breyta þessari stillingu skaltu opna heimildir í forritsupplýsingum Veggfóðurs."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Leyfa aðgang"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Þjónusta fyrir kvikt, breytilegt veggfóður"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Daglegt veggfóður"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Ýttu til að kveikja"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Veggfóðrið breytist sjálfkrafa á hverjum degi. Ýttu á &lt;strong&gt;Velja veggfóður&lt;/strong&gt;á næsta skjá til að ljúka uppsetningu."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Sækja veggfóður framvegis einungis með Wi-Fi"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Áfram"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Sækir fyrsta veggfóður…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Ekki tókst að sækja fyrsta veggfóður. Athugaðu netstillingarnar og reyndu aftur."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Veggfóðrið breytist sjálfkrafa á hverjum degi"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Stillingar"</string>
-    <string name="explore" msgid="7468719504199497281">"Skoða"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Næsta veggfóður"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Slökkt er á breytingu á veggfóðri í þessu tæki"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Kerfisstjóri hefur slökkt á breytingu á veggfóðri"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Veggfóður er valið"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Þú þarft nettengingu til að skoða veggfóður. Tengstu og reyndu aftur."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Smámynd fyrir núverandi veggfóður á heimaskjá"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Smámynd fyrir núverandi veggfóður á lásskjá"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Smámynd fyrir núverandi veggfóður"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Smámynd fyrir veggfóður"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Skoða veggfóður á heimaskjá"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Skoða veggfóður á lásskjá"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Uppfæra daglegt veggfóður á heimaskjá"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Uppfæra daglegt veggfóður"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Uppfærir daglegt veggfóður…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Ekki tókst að endurnýja daglegt veggfóður. Athugaðu nettenginguna og reyndu aftur."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Loka upplýsingasvæði veggfóðurs"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Stækka upplýsingasvæði veggfóðurs"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Veggfóður í tækinu"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Í tækinu"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android veggfóður"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Kvik veggfóður"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Myndirnar mínar"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Mín mynd"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Veggfóður"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Forritið er ekki uppsett."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Miðja"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Miðjuskurður"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Teygja"</string>
-</resources>

diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 58f726d..f34ab80 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Veggfóður"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Veggfóður"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Veldu veggfóður"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Velja veggfóður"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Vistar sem veggfóður…"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b5809dd..3ef3e42 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Sfondi"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Sfondi"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Seleziona sfondo"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Imposta sfondo"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Impostazione dello sfondo…"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 28c05b8..876c3e1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -17,7 +17,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="5610614769724978966">"טפטים"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"טפטים"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"בחירת טפט"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"הגדרת טפט"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"מגדיר טפט…"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a89717b..1ab89d2 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -17,7 +17,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="5610614769724978966">"壁紙"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"壁紙"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"壁紙の選択"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"壁紙を設定"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"壁紙を設定しています…"</string>
@@ -34,8 +36,8 @@
     <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"ロック画面"</string>
     <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"ホーム画面とロック画面"</string>
     <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"画像が切り替わる壁紙"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"現在の壁紙をここに表示するには、<xliff:g id="APP_NAME">%1$s</xliff:g>に端末のストレージへのアクセスを許可する必要があります。"</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"現在の壁紙をここに表示するには、壁紙に端末のストレージへのアクセス権限を許可する必要があります。\n\nこの設定を変更するには、壁紙のアプリ情報の [権限] に移動してください。"</string>
+    <string name="permission_needed_explanation" msgid="139166837541426823">"現在の壁紙をここに表示するには、<xliff:g id="APP_NAME">%1$s</xliff:g>にデバイスのストレージへのアクセスを許可する必要があります。"</string>
+    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"現在の壁紙をここに表示するには、壁紙にデバイスのストレージへのアクセス権限を許可する必要があります。\n\nこの設定を変更するには、壁紙のアプリ情報の [権限] に移動してください。"</string>
     <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"アクセスを許可"</string>
     <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"画像が切り替わるライブ壁紙サービス"</string>
     <string name="daily_refresh_tile_title" msgid="3270456074558525091">"毎日の壁紙"</string>
@@ -49,8 +51,8 @@
     <string name="settings_button_label" msgid="8724734130079207955">"設定"</string>
     <string name="explore" msgid="7468719504199497281">"詳細"</string>
     <string name="next_wallpaper" msgid="3911873152952596232">"次の壁紙"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"壁紙の設定は、お使いの端末では無効になっています"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"壁紙の設定は、端末の管理者により無効にされています"</string>
+    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"壁紙の設定は、お使いのデバイスでは無効になっています"</string>
+    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"壁紙の設定は、デバイスの管理者により無効にされています"</string>
     <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"壁紙の設定が完了しました"</string>
     <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"壁紙を表示するには、インターネット接続が必要です。接続してから、もう一度お試しください。"</string>
     <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"現在設定されているホーム画面の壁紙のサムネイル"</string>
@@ -65,8 +67,8 @@
     <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"毎日の壁紙を更新できませんでした。ネットワーク接続を確認してからもう一度お試しください。"</string>
     <string name="collapse_attribution_panel" msgid="4367971404848122275">"壁紙の情報パネルを折りたたむ"</string>
     <string name="expand_attribution_panel" msgid="6975094181456095915">"壁紙の情報パネルを展開"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"端末に保存されている壁紙"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"端末上"</string>
+    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"デバイスに保存されている壁紙"</string>
+    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"デバイス上"</string>
     <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android の壁紙"</string>
     <string name="live_wallpapers_category_title" msgid="1814374812192366349">"ライブ壁紙"</string>
     <string name="my_photos_category_title" msgid="4294567122144565273">"マイフォト"</string>

diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
deleted file mode 100644
index 2008c5b..0000000
--- a/res/values-ka-rGE/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"ფონები"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"აირჩიეთ ფონი"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ფონის დაყენება"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"მიმდინარეობს ფონის დაყენება…"</string>
-    <string name="try_again" msgid="8278874823700921234">"ხელახლა ცდა"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"ფონის დაყენება ვერ მოხერხდა."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"ფონი ვერ ჩაიტვირთა. სურათი დაზიანებული ან მიუწვდომელია."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"ამჟამად დაყენებული"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"ყოველდღიური ფონი"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"მთავარი ეკრანი"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"ჩაკეტილი ეკრანი"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"მთავარი და ჩაკეტილი ეკრანები"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"ფონის დაყენება"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"მთავარი ეკრანი"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"ჩაკეტილი ეკრანი"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"მთავარი ეკრანი და ჩაკეტილი ეკრანი"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"ფონი ცვალებადი სურათებით"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"ამჟამინდელი ფონის აქ საჩვენებლად <xliff:g id="APP_NAME">%1$s</xliff:g> საჭიროებს წვდომას თქვენი მოწყობილობის მეხსიერებაზე."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"ამჟამინდელი ფონის აქ საჩვენებლად Wallpapers საჭიროებს წვდომას თქვენი მოწყობილობის მეხსიერებაზე.\n\nამ პარამეტრის შესაცვლელად გადადით Wallpapers-ის აპის ინფორმაციის ნებართვების არეზე."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"წვდომის დაშვება"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"ცოცხალი ფონის სერვისი ცვალებადი ფონებისთვის"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"ყოველდღიური ფონი"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"შეეხეთ ჩასართავად"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"ფონი ავტომატურად შეიცვლება ყოველდღიურად. დაყენების დასასრულებლად შემდეგ ეკრანზე შეეხეთ &lt;strong&gt;ფონის დაყენებას&lt;/strong&gt;."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"მომავალში ფონების მხოლოდ Wi-Fi-ს მეშვეობით ჩამოტვირთვა"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"გაგრძელება"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"მიმდინარეობს პირველი ფონის ჩამოტვირთვა…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"პირველი ფონი ვერ ჩამოიტვირთა. გთხოვთ, შეამოწმოთ თქვენი ქსელის პარამეტრები და ხელახლა ცადოთ."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"ფონი ავტომატურად შეიცვლება ყოველდღიურად"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"პარამეტრები"</string>
-    <string name="explore" msgid="7468719504199497281">"მიმოხილვა"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"შემდეგი ფონი"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"ფონის დაყენება გათიშულია ამ მოწყობილობაზე"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"ფონის დაყენება გათიშულია თქვენი მოწყობილობის ადმინისტრატორის მიერ"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"ფონი წარმატებით დაყენდა"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"ფონების სანახავად საჭიროა კავშირი ინტერნეტთან. გთხოვთ, დაუკავშირდეთ ინტერნეტს და ხელახლა ცადოთ."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"მთავარ ეკრანზე ამჟამად დაყენებული ფონის ესკიზი"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"ჩაკეტილ ეკრანზე ამჟამად დაყენებული ფონის ესკიზი"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"ამჟამად დაყენებული ფონის ესკიზი"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"ფონის ესკიზი"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"მთავარი ეკრანის ფონის მიმოხილვა"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"ჩაკეტილი ეკრანის ფონის მიმოხილვა"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"მთავარი ეკრანის ყოველდღიური ფონის განახლება"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"ყოველდღიური ფონის განახლება"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"მიმდინარეობს ყოველდღიური ფონის განახლება…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"ყოველდღიური ფონი ვერ განახლდა. გთხოვთ, შეამოწმოთ ქსელის კავშირი და ხელახლა ცადოთ."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"ფონის ინფორმაციის პანელის ჩაკეცვა"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"ფონის ინფორმაციის პანელის გაშლა"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"მოწყობილობაზე შენახული ფონები"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"მოწყობილობიდან"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android ფონი"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"ცოცხალი ფონები"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"ჩემი ფოტოები"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"ჩემი ფოტო"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"ფონი"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"აპი დაინსტალირებული არ არის."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"ცენტრირება"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ცენტრში ჩამოჭრა"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"გადაჭიმვა"</string>
-</resources>

diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 2008c5b..d8f1ede 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml

@@ -17,7 +17,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="5610614769724978966">"ფონები"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"ფონები"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"აირჩიეთ ფონი"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ფონის დაყენება"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"მიმდინარეობს ფონის დაყენება…"</string>

diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
deleted file mode 100644
index ac3a90e..0000000
--- a/res/values-kk-rKZ/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Тұсқағаздар"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Тұсқағазды таңдаңыз"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Тұсқағаз орнату"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Тұсқағаз орнатылуда…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Қайталау"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Тұсқағаз орнатылмады."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Тұсқағаз жүктелмеді. Кескін бүлінген не қолжетімді емес."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Ағымдағы орнатылған"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Күнделікті тұсқағаз"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Негізгі экран"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Құлыпталған экран"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Негізгі және құлыпталған экран"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Тұсқағаз орнату"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Негізгі экран"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Құлыпталған экран"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Негізгі экран және құлыпталған экран"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Тұсқағазды ауыстырып тұру"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Ағымдағы тұсқағазды көрсету үшін <xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасына құрылғының жадына кіру рұқсаты қажет."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Ағымдағы тұсқағаз осы жерге шығуы үшін, \"Тұсқағаздар\" қолданбасына құрылғы жадына кіру рұқсаты қажет.\n\nБұл параметрді осы қолданба ақпаратындағы \"Рұқсаттар\" бөлімінен өзгертуге болады."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Кіру рұқсатын беру"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Тұсқағаздарды ауыстыруға арналған анимациялық фон қызметі"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Күнделікті тұсқағаз"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Қосу үшін түртіңіз"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Тұсқағаз күн сайын автоматты түрде ауыстырылып отырады. Реттеуді аяқтау үшін келесі экранда &lt;strong&gt;Тұсқағазды орнату&lt;/strong&gt; түймесін басыңыз."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Болашақ тұсқағаздар Wi-Fi желісінде ғана жүктеледі"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Жалғастыру"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Бірінші тұсқағаз жүктелуде..."</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Бірінші тұсқағаз жүктелмеді. Желі параметрлерін тексеріп, әрекетті қайталаңыз."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Тұсқағаз күн сайын автоматты түрде өзгеріп тұрады"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Параметрлер"</string>
-    <string name="explore" msgid="7468719504199497281">"Шолу"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Келесі тұсқағаз"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Бұл құрылғыда тұсқағаз орнатылмайды"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Құрылғы әкімшісі тұсқағаз орнатуға тыйым салған."</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Тұсқағаз орнатылды"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Тұсқағаздарды көру үшін интернет байланысы қажет. Желіге қосылып, әрекетті қайталаңыз."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Ағымдағы орнатылған негізгі экран тұсқағазының нобайы"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Ағымдағы орнатылған құлыпталған экран тұсқағазының нобайы"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Ағымдағы орнатылған тұсқағаздың нобайы"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Тұсқағаз нобайы"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Негізгі экран тұсқағазын шолу"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Құлыпталған экран тұсқағазын шолу"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Негізгі экрандағы күнделікті тұсқағазды ауыстыру"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Күнделікті тұсқағазды ауыстыру"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Күнделікті тұсқағаз ауыстырылуда…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Күнделікті тұсқағаз ауыстырылмады. Желі байланысын тексеріп, әрекетті қайталаңыз."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Тұсқағаздың ақпарат панелін жию"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Тұсқағаздың ақпарат панелін жаю"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Құрылғыдағы тұсқағаздар"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Құрылғыда"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android тұсқағазы"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Анимациялық фондар"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Cуреттерім"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Cуретім"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Тұсқағаз"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Қолданба орнатылмаған."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Ортасы"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Ортасынан қию"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Созу"</string>
-</resources>

diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index ac3a90e..554510a 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Тұсқағаздар"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Тұсқағаздар"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Тұсқағазды таңдаңыз"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Тұсқағаз орнату"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Тұсқағаз орнатылуда…"</string>

diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
deleted file mode 100644
index 952772a..0000000
--- a/res/values-km-rKH/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"ផ្ទាំងរូបភាព"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"ជ្រើសរើសផ្ទាំងរូបភាព"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"កំណត់ផ្ទាំងរូបភាព"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"កំពុងកំណត់ផ្ទាំងរូបភាព..."</string>
-    <string name="try_again" msgid="8278874823700921234">"ព្យាយាមម្ដងទៀត"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"មិនអាចកំណត់ផ្ទាំងរូបភាពបានទេ"</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"មិនអាចផ្ទុកផ្ទាំងរូបភាពបានទេ។ រូបភាពអាចខូច ឬមិនអាចប្រើបាន។"</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"ឥឡូវនេះបានកំណត់"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"ផ្ទាំងរូបភាពប្រចាំថ្ងៃ"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"អេក្រង់ដើម"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"អេក្រង់ចាក់សោ"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"ដើម និងចាក់សោ"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"កំណត់ផ្ទាំងរូបភាព"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"អេក្រង់ដើម"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"អេក្រង់ចាក់សោ"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"អេក្រង់ដើម និងអេក្រង់ចាក់សោ"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"បង្វិលផ្ទាំងរូបភាពបែបរូបភាព"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"ដើម្បីបង្ហាញផ្ទាំងរូបភាពបច្ចុប្បន្ននៅទីនេះ <xliff:g id="APP_NAME">%1$s</xliff:g> ត្រូវការសិទ្ធិចូលប្រើទំហំផ្ទុកឧបករណ៍របស់អ្នក។"</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"ដើម្បីបង្ហាញផ្ទាំងរូបភាពបច្ចុប្បន្ននៅទីនេះ កម្មវិធី Wallpapers ត្រូវការសិទ្ធិចូលប្រើទំហំផ្ទុករបស់ឧបករណ៍អ្នក។\n\nដើម្បីផ្លាស់ប្តូរការកំណត់នេះ សូមចូលទៅកាន់ផ្នែកការអនុញ្ញាតនៃព័ត៌មានរបស់កម្មវិធី Wallpapers ។"</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"ផ្តល់សិទិ្ធចូលប្រើ"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"សេវាកម្មផ្ទាំងរូបភាពរស់រវើកសម្រាប់បង្វិលផ្ទាំងរូបភាព"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"ផ្ទាំងរូបភាពប្រចាំថ្ងៃ"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"ប៉ះដើម្បីបើក"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Wallpaper នឹងផ្លាស់ប្ដូរដោយស្វ័យប្រវត្តិជារៀងរាល់ថ្ងៃ។ ដើម្បីបញ្ចប់ការរៀបចំ សូមចុច &lt;strong&gt;កំណត់ផ្ទាំងរូបភាព&lt;/strong&gt; នៅលើអេក្រង់បន្ទាប់។"</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"ទាញយកផ្ទាំងរូបភាពនៅពេលក្រោយតាមរយៈ Wi-Fi តែប៉ុណ្ណោះ"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"បន្ត"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"កំពុងទាញយកផ្ទាំងរូបភាពដំបូង…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"មិនអាចទាញយកផ្ទាំងរូបភាពដំបូងបានទេ។ សូមពិនិត្យការកំណត់បណ្តាញរបស់អ្នក រួចព្យាយាមម្តងទៀត។"</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"ផ្ទាំងរូបភាពនឹងប្តូរដោយស្វ័យប្រវត្តិជារៀងរាល់ថ្ងៃ"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"ការកំណត់"</string>
-    <string name="explore" msgid="7468719504199497281">"រុករក"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"ផ្ទាំងរូបភាពបន្ទាប់"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"ការកំណត់ផ្ទាំងរូបភាពត្រូវបានបិទនៅលើឧបករណ៍នេះ"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"ការកំណត់ផ្ទាំងរូបភាពត្រូវបានបិទដោយអ្នកគ្រប់គ្រងឧបករណ៍របស់អ្នក"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"បានកំណត់ផ្ទាំងរូបភាពដោយជោគជ័យ"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"អ្នកត្រូវភ្ជាប់អ៊ីនធឺណិតដើម្បីមើលផ្ទាំងរូបភាព។ សូមភ្ជាប់ រួចព្យាយាមម្តងទៀត។"</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"បច្ចុប្បន្នត្រូវបានកំណត់ជារូបភាពតូចនៃផ្ទាំងរូបភាពអេក្រង់ដើម"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"បច្ចុប្បន្នត្រូវបានកំណត់ជារូបភាពតូចនៃផ្ទាំងរូបភាពអេក្រង់ចាក់សោ"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"បច្ចុប្បន្នត្រូវបានកំណត់ជារូបភាពតូចនៃផ្ទាំងរូបភាព"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"រូបភាពតូចនៃផ្ទាំងរូបភាព"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"ស្វែងយល់ពីផ្ទាំងរូបភាពអេក្រង់ដើម"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"ស្វែងយល់ពីផ្ទាំងរូបភាពអេក្រង់ចាក់សោ"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"ផ្ទុកផ្ទាំងរូបភាពអេក្រង់ដើមប្រចាំថ្ងៃឡើងវិញ"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"ផ្ទុកផ្ទាំងរូបភាពប្រចាំថ្ងៃឡើងវិញ"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"កំពុងផ្ទុកផ្ទាំងរូបភាពប្រចាំថ្ងៃឡើងវិញ…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"បានបរាជ័យក្នុងការផ្ទុកផ្ទាំងរូបភាពប្រចាំថ្ងៃឡើងវិញ។ សូមពិនិត្យការតភ្ជាប់បណ្តាញរបស់អ្នក ហើយព្យាយាមម្តងទៀត។"</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"បង្រួមផ្ទាំងព័ត៌មានផ្ទាំងរូបភាព"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"ពង្រីកផ្ទាំងព័ត៌មានផ្ទាំងរូបភាព"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"ផ្ទាំងរូបភាពនៅលើឧបករណ៍"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"នៅលើឧបករណ៍"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"ផ្ទាំងរូបភាព Android"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"ផ្ទាំងរូបភាពរស់រវើក"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"រូបថតរបស់ខ្ញុំ"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"រូបថតរបស់ខ្ញុំ"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"ផ្ទាំងរូបភាព"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"កម្មវិធីមិនបានដំឡើងទេ។"</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"កណ្តាល"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ច្រឹបកណ្តាល"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ទាញ"</string>
-</resources>

diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 952772a..353e631 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml

@@ -17,7 +17,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="5610614769724978966">"ផ្ទាំងរូបភាព"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"ផ្ទាំងរូបភាព"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"ជ្រើសរើសផ្ទាំងរូបភាព"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"កំណត់ផ្ទាំងរូបភាព"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"កំពុងកំណត់ផ្ទាំងរូបភាព..."</string>

diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
deleted file mode 100644
index a433571..0000000
--- a/res/values-kn-rIN/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"ವಾಲ್‌ಪೇಪರ್ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸಿ"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="try_again" msgid="8278874823700921234">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"ವಾಲ್‌ಪೇಪರ್ ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಚಿತ್ರವು ದೋಷಪೂರಿತವಾಗಿರಬಹುದು ಅಥವಾ ಲಭ್ಯವಿಲ್ಲದಿರಬಹುದು."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"ಪ್ರಸ್ತುತವಾಗಿ ಹೊಂದಿಸಿ"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"ದಿನನಿತ್ಯದ ವಾಲ್‌ಪೇಪರ್"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"ಮುಖಪುಟದ ಪರದೆ"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"ಲಾಕ್ ಪರದೆ"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"ಮುಖಪುಟ ಮತ್ತು ಲಾಕ್‌"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸಿ"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"ಮುಖಪುಟದ ಪರದೆ"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"ಲಾಕ್ ಪರದೆ"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"ಮುಖಪುಟದ ಪರದೆ ಮತ್ತು ಲಾಕ್ ಪರದೆ"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"ತಿರುಗುವ ಚಿತ್ರದ ವಾಲ್‌ಪೇಪರ್"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"ಪ್ರಸ್ತುತ ವಾಲ್ಪೇಪರ್ ಅನ್ನು ಇಲ್ಲಿ ಪ್ರದರ್ಶಿಸಲು, <xliff:g id="APP_NAME">%1$s</xliff:g> ಗೆ ನಿಮ್ಮ ಸಾಧನದ ಸಂಗ್ರಹಣೆಯ ಪ್ರವೇಶದ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"ಪ್ರಸ್ತುತ ಅನ್ನು ಇಲ್ಲಿ ಪ್ರದರ್ಶಿಸಲು, ವಾಲ್ಪೇಪರ್‌ಗಳಿಗೆ ನಿಮ್ಮ ಸಾಧನದ ಸಂಗ್ರಹಣೆ ಪ್ರವೇಶದ ಅಗತ್ಯವಿದೆ. \n\nಈ ಸೆಟ್ಟಿಂಗ್‌ ಅನ್ನು ಬದಯಾಯಿಸಲು, ವಾಲ್ಪೇಪರ್‌ಗಳ ಅಪ್ಲಿಕೇಶನ್‌ನ ಮಾಹಿತಿಯ ಅನುಮತಿ ಪ್ರದೇಶಕ್ಕೆ ಹೋಗಿ."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"ಪ್ರವೇಶವನ್ನು ಆನುಮತಿಸಿ"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"ತಿರುಗುವ ವಾಲ್‌ಪೇಪರ್‌ಗಳಿಗಾಗಿ ಲೈವ್ ವಾಲ್‌ಪೇಪರ್ ಸೇವೆ"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"ದಿನನಿತ್ಯದ ವಾಲ್‌ಪೇಪರ್"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"ಆನ್‌‌‌ ಮಾಡಲು ಟ್ಯಾಪ್‌ ಮಾಡಿ"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"ವಾಲ್‌ಪೇಪರ್ ಪ್ರತಿ ದಿನ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಬದಲಾಗುತ್ತದೆ. ಸೆಟಪ್ ಮುಗಿಸಲು, ಮುಂದಿನ ಪರದೆಯಲ್ಲಿನ &lt;strong&gt;ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸಿ&lt;/strong&gt; ಅನ್ನು ಟ್ಯಾಪ್‌ ಮಾಡಿ."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"ಭವಿಷ್ಯದ ವಾಲ್‌ಪೇಪರ್‌ಗಳನ್ನು ವೈ-ಫೈನಲ್ಲಿ ಮಾತ್ರ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"ಮುಂದುವರಿಸಿ"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"ಮೊದಲ ವಾಲ್‌ಪೇಪರ್ ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"ಮೊದಲನೆಯ ವಾಲ್‌ಪೇಪರ್ ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ ಹಾಗೂ ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"ವಾಲ್‌ಪೇಪರ್ ಪ್ರತಿ ದಿನ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಬದಲಾಗುತ್ತದೆ"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="explore" msgid="7468719504199497281">"ಎಕ್ಸ್‌ಪ್ಲೋರ್‌‌ ಮಾಡಿ"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"ಮುಂದಿನ ವಾಲ್‌ಪೇಪರ್"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"ಈ ಸಾಧನದಲ್ಲಿ ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸುವುದನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"ನಿಮ್ಮ ಸಾಧನ ನಿರ್ವಾಹಕರಿಂದ ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸುವುದನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"ವಾಲ್‌ಪೇಪರ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಹೊಂದಿಸಲಾಗಿದೆ"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"ವಾಲ್‌ಪೇಪರ್‌ಗಳನ್ನು ವೀಕ್ಷಿಸಲು ನಿಮಗೆ ಇಂಟರ್ನೆಟ್‌ ಸಂಪರ್ಕ ಅಗತ್ಯವಿದೆ. ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಿಸಿ ಹಾಗೂ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"ಪ್ರಸ್ತುತವಾಗಿ ಮುಖಪುಟ ಪರದೆಯ ವಾಲ್‌ಪೇಪರ್ ಥಂಬ್‌ನೇಲ್ ಹೊಂದಿಸಿ"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"ಪ್ರಸ್ತುತವಾಗಿ ಲಾಕ್ ಪರದೆಯ ವಾಲ್‌ಪೇಪರ್ ಥಂಬ್‌ನೇಲ್ ಹೊಂದಿಸಿ"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"ಪ್ರಸ್ತುತವಾಗಿ ವಾಲ್‌ಪೇಪರ್ ಥಂಬ್‌ನೇಲ್ ಹೊಂದಿಸಿ"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"ವಾಲ್‌ಪೇಪರ್ ಥಂಬ್‌ನೇಲ್"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"ಮುಖಪುಟ ಪರದೆಯ ವಾಲ್‌ಪೇಪರ್ ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"ಲಾಕ್ ಪರದೆಯ ವಾಲ್‌ಪೇಪರ್ ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"ದೈನಂದಿನ ಮುಖಪುಟ ಪರದೆಯ ವಾಲ್‌ಪೇಪರ್ ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"ದಿನನಿತ್ಯದ ವಾಲ್‌ಪೇಪರ್ ಅನ್ನು ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"ದೈನಂದಿನ ವಾಲ್‌ಪೇಪರ್ ಅನ್ನು ರಿಫ್ರೆಶ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"ಪ್ರತಿದಿನದ ವಾಲ್‌ಪೇಪರ್ ರಿಫ್ರೆಶ್ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ. ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಸಂಪರ್ಕವನ್ನು ಪರಿಶೀಲಿಸಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"ವಾಲ್‌ಪೇಪರ್ ಮಾಹಿತಿ ಫಲಕ ಸಂಕುಚಿಸಿ"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"ವಾಲ್‌ಪೇಪರ್ ಮಾಹಿತಿ ಫಲಕ ವಿಸ್ತರಿಸಿ"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"ಸಾಧನದಲ್ಲಿನ ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"ಸಾಧನದಲ್ಲಿ"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android ವಾಲ್‌ಪೇಪರ್"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"ಲೈವ್ ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"ನನ್ನ ಫೋಟೋಗಳು"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"ನನ್ನ ಫೋಟೋ"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"ವಾಲ್‌ಪೇಪರ್‌"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಇನ್‌ಸ್ಟಾಲ್‌ ಮಾಡಲಾಗಿಲ್ಲ"</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"ಮಧ್ಯ"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ಮಧ್ಯಕ್ಕೆ ಕ್ರಾಪ್ ಮಾಡಿ"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ವಿಸ್ತರಿಸಿ"</string>
-</resources>

diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index a433571..5a25608 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml

@@ -17,7 +17,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="5610614769724978966">"ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"ವಾಲ್‌ಪೇಪರ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸಿ"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ..."</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c9a260f..8ef1e57 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -17,7 +17,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="5610614769724978966">"배경화면"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"배경화면"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"배경화면 선택"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"배경화면 설정"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"배경화면을 설정하는 중..."</string>

diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
deleted file mode 100644
index 22cbaed..0000000
--- a/res/values-ky-rKG/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Тушкагаздар"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Тушкагаз тандоо"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Тушкагаз орнотуу"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Тушкагаз орнотулууда…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Кайталоо"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Тушкагаз орнотулбай жатат."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Тушкагаз жүктөлбөй жатат. Сүрөт бузулган же жеткиликтүү эмес."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Учурда тушкагаз катары орнотулган"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Күнүмдүк тушкагаз"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Башкы экран"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Кулпуланган экран"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Башкы жана кулпуланган экран"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Тушкагаз орнотуу"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Башкы экран"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Кулпуланган экран"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Башкы экран жана кулпуланган экран"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Алмаштырма тушкагаз сүрөтү"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Учурдагы тушкагазды бул жерден көрсөтүү үчүн <xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна түзмөгүңүздүн сактагычын колдонуу мүмкүнчүлүгү керек."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Учурдагы тушкагазды бул жерден көрсөтүү үчүн Тушкагаздар колдонмосу түзмөгүңүздүн сактагычын колдонуу мүмкүнчүлүгүн алышы керек.\n\nБул жөндөөнү өзгөртүү үчүн Тушкагаздар колдонмосу жөнүндө маалыматтын \"Уруксаттар\" бөлүмүнө өтүңүз."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Мүмкүнчүлүк берүү"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Жандуу тушкагаз кызматы тушкагаздарды алмаштырат"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Күнүмдүк тушкагаз"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Күйгүзүү үчүн таптап коюңуз"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Тушкагаз күн сайын автоматтык түрдө алмашып турат. Жөндөөнү аягына чыгаруу үчүн кийинки экрандан &lt;strong&gt;Тушкагаз орнотуу&lt;/strong&gt; баскычын таптап коюңуз."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Келечекте тушкагаздар Wi-Fi аркылуу гана жүктөлүп алынсын"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Улантуу"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Биринчи тушкагаз жүктөлүп алынууда…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Биринчи тушкагаз жүктөлүп алынбай жатат. Тармак жөндөөлөрүңүздү текшерип, кайра аракет кылыңыз."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Тушкагаз күн сайын автоматтык түрдө алмашып турат"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Жөндөөлөр"</string>
-    <string name="explore" msgid="7468719504199497281">"Изилдөө"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Кийинки тушкагаз"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Бул түзмөктө тушкагазды жөндөө өчүрүлгөн"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Тушкагазды жөндөө администраторуңуз тарабынан өчүрүлгөн"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Тушкагаз ийгиликтүү орнотулду"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Тушкагаздарды көрүү үчүн Интернетке туташуу керек. Интернетке туташып туруп, кайра аракет кылыңыз."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Башкы экрандын учурда коюлган тушкагаз эскизи"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Кулпуланган экрандын учурда коюлган тушкагаз эскизи"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Учурда коюлган тушкагаз эскизи"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Тушкагаз эскизи"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Башкы экрандын тушкагазын изилдөө"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Кулпуланган экрандын тушкагазын изилдөө"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Башкы экрандын күнүмдүк тушкагазын жаңыртуу"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Күнүмдүк тушкагазды жаңыртуу"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Күнүмдүк тушкагаз жаңыртылууда…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Күнүмдүк тушкагаз жаңыртылбай калды. Интернетке туташууңузду текшерип, дагы бир жолу аракет кылыңыз."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Тушкагаздын маалымат панелин жыйыштыруу"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Тушкагаздын маалымат панелин жайып көрсөтүү"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Түзмөктөгү тушкагаздар"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Түзмөктө"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android тушкагазы"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Жандуу тушкагаздар"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Менин сүрөттөрүм"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Менин сүрөтүм"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Тушкагаз"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Колдонмо орнотулган эмес."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Ортосунда"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Ортосуна тууралап кесүү"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Чоюу"</string>
-</resources>

diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 22cbaed..1aaea2a 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Тушкагаздар"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Тушкагаздар"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Тушкагаз тандоо"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Тушкагаз орнотуу"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Тушкагаз орнотулууда…"</string>

diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
deleted file mode 100644
index 781447c..0000000
--- a/res/values-lo-rLA/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"ຮູບພື້ນຫຼັງ"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"ເລືອກຮູບພື້ນຫຼັງ"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ຕັ້ງເປັນຮູບພື້ນຫຼັງ"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ກຳລັງຕັ້ງຮູບພື້ນຫຼັງ..."</string>
-    <string name="try_again" msgid="8278874823700921234">"ລອງໃໝ່"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"ບໍ່ສາມາດຕັ້ງເປັນຮູບພື້ນຫຼັງໄດ້."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"ບໍ່ສາມາດໂຫຼດພາບພື້ນຫຼັງໄດ້"</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"ຕັ້ງຕອນນີ້"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"ຮູບພື້ນຫຼັງປະຈຳວັນ"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"ໜ້າຈໍຫຼັກ"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"ໜ້າຈໍລັອກ"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"ໜ້າຈໍຫຼັກ ແລະ ການລັອກ"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"ຕັ້ງເປັນຮູບພື້ນຫຼັງ"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"ໜ້າຈໍຫຼັກ"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"ໜ້າຈໍລັອກ"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"ໜ້າຈໍຫຼັກ ແລະ ໜ້າຈໍລັອກ"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"ໝຸນຮູບພື້ນຫຼັງ"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"ເພື່ອສະແດງພາບພື້ນຫຼັງປັດຈຸບັນຢູ່ບ່ອນນີ້, <xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການສິດເຂົ້າເຖິງບ່ອນຈັດເກັບຂໍ້ມູນອຸປະກອນຂອງທ່ານ."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"ເພື່ອສະແດງຮູບພື້ນຫຼັງປັດຈຸບັນຢູ່ບ່ອນນີ້, ແອັບ Wallpapers ຈະຕ້ອງໃຊ້ສິດອະນຸຍາດເຂົ້າເຖິງບ່ອນຈັດເກັບຂໍ້ມູນອຸປະກອນຂອງທ່ານກ່ອນ.\n\nເພື່ອປ່ຽນການຕັ້ງຄ່ານີ້, ໃຫ້ໄປທີ່ພື້ນທີ່ສິດອະນຸຍາດຂອງຂໍ້ມູນແອັບຂອງ Wallpapers."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"ອະນຸຍາດການເຂົ້າເຖິງ"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"ບໍລິການຮູບພື້ນຫຼັງແບບເຄື່ອນໄຫວສຳລັບຮູບພື້ນຫຼັງແບບໝຸນໄດ້"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"ຮູບພື້ນຫຼັງປະຈຳວັນ"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"ແຕະເພື່ອເປີດໃຊ້"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"ຮູບພື້ນຫຼັງຈະຖືກປ່ຽນໃໝ່ທຸກມື້ໂດຍອັດຕະໂນມັດ. ເພື່ອສຳເລັດການຕັ້ງຄ່າ, ໃຫ້ແຕະໃສ່ &lt;strong&gt;ຕັ້ງເປັນຮູບພື້ນຫຼັງ&lt;/strong&gt; ຢູ່ໜ້າຈໍຖັດໄປ."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"ດາວໂຫລດຮູບພື້ນຫຼັງໃນອະນາຄົດຜ່ານທາງ Wi-Fi ເທົ່ານັ້ນ"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"ສືບຕໍ່"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"ກຳລັງດາວໂຫລດຮູບພື້ນຫຼັງທຳອິດ…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"ບໍ່ສາມາດດາວໂຫລດຮູບພື້ນຫຼັງທຳອິດໄດ້. ກະລຸນາກວດສອບການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງທ່ານແລ້ວລອງໃໝ່."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"ຮູບພື້ນຫຼັງຈະປ່ຽນອັດຕະໂນມັດທຸກໆມື້"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"ການຕັ້ງຄ່າ"</string>
-    <string name="explore" msgid="7468719504199497281">"ສຳຫຼວດ"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"ຮູບພື້ນຫຼັງຖັດໄປ"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"ການຕັ້ງຮູບພື້ນຫຼັງຖືກປິດໄວ້ໃນອຸປະກອນນີ້"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"ການຕັ້ງຮູບພື້ນຫຼັງຖືກປິດໄວ້ໂດຍຜູ້ເບິ່ງແຍງອຸປະກອນຂອງທ່ານ"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"ຕັ້ງຮູບພື້ນຫຼັງສຳເລັດແລ້ວ"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"ທ່ານຕ້ອງໃຊ້ອິນເຕີເນັດເພື່ອເບິ່ງຮູບພື້ນຫຼັງ. ກະລຸນາເຊື່ອມຕໍ່ແລ້ວລອງໃໝ່."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"ຕົວຢ່າງຮູບພື້ນຫຼັງໜ້າຈໍທຳອິດປັດຈຸບັນ"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"ຕົວຢ່າງຮູບພື້ນຫຼັງໜ້າຈໍລັອກປັດຈຸບັນ"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"ຕົວຢ່າງຮູບພື້ນຫຼັງປັດຈຸບັນ"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"ຕົວຢ່າງຮູບພື້ນຫຼັງ"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"ສຳຫຼວດຮູບພື້ນຫຼັງໜ້າຈໍຫຼັກ"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"ສຳຫຼວດຮູບພື້ນຫຼັງໜ້າຈໍລັອກ"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"ໂຫຼດຂໍ້ມູນຮູບພື້ນຫຼັງໜ້າຈໍຫຼັກຄືນໃໝ່ທຸກມື້"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"ໂຫຼດຮູບພື້ນຫຼັງຄືນໃໝ່ທຸກມື້"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"ກຳລັງໂຫຼດຂໍ້ມູນຮູບພື້ນຫຼັງປະຈຳວັນຄືນໃໝ່…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"ໂຫຼດຮູບພື້ນຫຼັງຄືນໃໝ່ທຸກມື້ບໍ່ສຳເລັດ. ກະລຸນາກວດສອບການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງທ່ານແລ້ວລອງໃໝ່ອີກຄັ້ງ."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"ຫຍໍ້ແຖບຂໍ້ມູນຮູບພື້ນຫຼັງ"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"ຂະຫຍາຍແຖບຂໍ້ມູນຮູບພື້ນຫຼັງ"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"ຮູບພື້ນຫຼັງໃນເຄື່ອງ"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"ໃນອຸປະກອນ"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"ຮູບພື້ນຫຼັງ Android"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"ຮູບພື້ນຫຼັງແບບເຄື່ອນໄຫວ"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"ຮູບຂອງຂ້ອຍ"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"ຮູບຂອງຂ້ອຍ"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"ຮູບພື້ນຫຼັງ"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"ບໍ່ໄດ້ຕິດຕັ້ງແອັບເທື່ອ."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"ກາງ"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ຕັດເຄິ່ງກາງ"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ຍືດ"</string>
-</resources>

diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 781447c..353dab2 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml

@@ -17,7 +17,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="5610614769724978966">"ຮູບພື້ນຫຼັງ"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"ຮູບພື້ນຫຼັງ"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"ເລືອກຮູບພື້ນຫຼັງ"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ຕັ້ງເປັນຮູບພື້ນຫຼັງ"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ກຳລັງຕັ້ງຮູບພື້ນຫຼັງ..."</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d5514fe..829760e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Ekrano fonai"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Ekrano fonai"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Pasirinkite ekrano foną"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Nustatyti ekrano foną"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Nustatomas fonas…"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2bdb1ea..03f5838 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Fona tapetes"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Fona tapetes"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Atlasiet fona tapeti"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Iestatīt fona tapeti"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Notiek fona tapetes iestatīšana..."</string>

diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
deleted file mode 100644
index 246f018..0000000
--- a/res/values-mk-rMK/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Тапети"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Изберете тапет"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Постави го тапетот"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Тапетот се поставува…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Обиди се пак"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Тапетот не може да се постави."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Тапетот не може да се вчита. Сликата е оштетена или недостапна."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Моментално поставен"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Дневен тапет"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Почетен екран"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Заклучен екран"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Почетен и заклучен екран"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Поставете го тапетот"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Почетен екран"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Заклучен екран"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Почетен и заклучен екран"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Тапет со ротирачки слики"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"За да го прикаже тековниот тапет тука, <xliff:g id="APP_NAME">%1$s</xliff:g> бара пристап до меморијата на уредот."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"За да го прикаже тековниот тапет тука, Wallpapers бара пристап до меморијата на уредот.\n\nЗа да ја промените поставкава, одете во областа „Дозволи“ во информациите за апликацијата Wallpapers."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Дозволи пристап"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Услуга со анимирани тапети за ротирачки тапети"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Дневен тапет"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Допрете за да вклучите"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Тапетот ќе се менува автоматски секој ден. За да завршите со поставувањето, допрете &lt;strong&gt;Постави тапет&lt;/strong&gt; на следниот екран."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Во иднина, преземај тапети само преку Wi-Fi"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Продолжи"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Се презема првиот тапет…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Првиот тапет не може да се преземе. Проверете ги мрежните поставки и обидете се повторно."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Тапетот ќе се менува автоматски секој ден"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Поставки"</string>
-    <string name="explore" msgid="7468719504199497281">"Истражувај"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Следен тапет"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Поставувањето тапет е оневозможено на овој уред"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Поставувањето тапет е оневозможено од администраторот на уредот"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Тапетот е успешно поставен"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Потребна ви е интернет-врска за да ги прикажувате тапетите. Поврзете се и обидете се повторно."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Сликичка од моментално поставениот тапет на почетен екран"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Сликичка од моментално поставениот тапет на заклучен екран"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Сликичка од моментално поставениот тапет"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Сликичка од тапет"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Истражувајте го тапетот на почетен екран"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Истражувајте го тапетот на заклучен екран"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Освежи го дневниот тапет за почетниот екран"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Освежи го дневниот тапет"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Се освежува дневниот тапет…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Освежувањето на дневниот тапет не успеа. Проверете ја мрежната врска и обидете се повторно."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Собери ја информациската табла на тапетот"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Прошири ја информациската табла на тапетот"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Тапети на уредот"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"На уредот"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Тапет од Android"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Анимирани тапети"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Мои фотографии"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Моја фотографија"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Тапет"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Апликацијата не е инсталирана."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Во средина"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Исечи централно"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Растегни"</string>
-</resources>

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 246f018..8014ce1 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Тапети"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Тапети"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Изберете тапет"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Постави го тапетот"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Тапетот се поставува…"</string>

diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
deleted file mode 100644
index 38abe14..0000000
--- a/res/values-ml-rIN/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"വാൾപേപ്പറുകൾ"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"വാൾപേപ്പർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"വാൾപേപ്പർ സജ്ജമാക്കുക"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"വാൾപേപ്പർ സജ്ജമാക്കുന്നു…"</string>
-    <string name="try_again" msgid="8278874823700921234">"വീണ്ടും ശ്രമിക്കുക"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"വാൾപേപ്പർ സജ്ജമാക്കാനാവുന്നില്ല."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"വാൾപേപ്പർ ലോഡുചെയ്യാനാവുന്നില്ല. ചിത്രം കേടായിരിക്കുന്നു അല്ലെങ്കിൽ ലഭ്യമല്ല."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"നിലവിൽ സജ്ജമാക്കി"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"പ്രതിദിന വാൾപേപ്പർ"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"ഹോം സ്‌ക്രീൻ"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"ലോക്ക് സ്‌ക്രീൻ"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"ഹോമും ലോക്ക് സ്‌ക്രീനും"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"വാൾപേപ്പർ സജ്ജമാക്കുക"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"ഹോം സ്‌ക്രീൻ"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"ലോക്ക് സ്‌ക്രീൻ"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"ഹോം സ്ക്രീനും ലോക്ക് സ്ക്രീനും"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"ചിത്ര വാൾപേപ്പർ തിരിക്കുന്നു"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"നിലവിലെ വാൾപേപ്പർ ഇവിടെ പ്രദർശിപ്പിക്കുന്നതിന്, <xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിന് നിങ്ങളുടെ ഉപകരണത്തിന്‍റെ സ്‌റ്റോറേജിലേക്ക് ആക്‌സസ് ആവശ്യമാണ്."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"നിലവിലെ വാൾപേപ്പർ ഇവിടെ പ്രദർശിപ്പിക്കുന്നതിന്, Wallpapers-ന് നിങ്ങളുടെ ഉപകരണത്തിന്റെ സ്റ്റോറേജിലേക്ക് ആക്സസ് ആവശ്യമാണ്.\n\nഈ ക്രമീകരണം മാറ്റുന്നതിന്, Wallpapers ആപ്പ് വിവരങ്ങളുടെ അനുമതികളിലേക്ക് പോവുക."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"ആക്‌സസ്സ് അനുവദിക്കുക"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"വാൾപേപ്പറുകൾ തിരിക്കുന്നതിനുള്ള സജീവ വാൾപേപ്പർ സേവനം"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"പ്രതിദിന വാൾപേപ്പർ"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"ഓണാക്കാൻ ടാപ്പുചെയ്യുക"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"എല്ലാ ദിവസവും വാൾപേപ്പർ സ്വമേധയാ മാറും. സജ്ജീകരണം പൂർത്തിയാക്കാൻ, അടുത്ത സ്ക്രീനിലെ &lt;strong&gt;വാൾപേപ്പർ സജ്ജീകരിക്കുക&lt;/strong&gt; എന്നതിൽ ടാപ്പ് ചെയ്യുക."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"ഭാവി വാൾപേപ്പറുകൾ വൈഫൈയിൽ മാത്രം ഡൗൺലോഡ് ചെയ്യുക"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"തുടരുക"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"ആദ്യ വാൾപേപ്പർ ഡൗൺലോഡ് ചെയ്യുന്നു…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"ആദ്യ വാൾപേപ്പർ ഡൗൺലോഡ് ചെയ്യാനാവുന്നില്ല. നിങ്ങളുടെ നെറ്റ്‌വർക്ക് ക്രമീകരണം പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"ദിവസവും സ്വയമേവ വാൾപേപ്പർ മാറും"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"ക്രമീകരണം"</string>
-    <string name="explore" msgid="7468719504199497281">"അടുത്തറിയൽ"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"അടുത്ത വാൾപേപ്പർ"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"വാൾപേപ്പർ സജ്ജമാക്കുന്നത് ഈ ഉപകരണത്തിൽ പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"വാൾപേപ്പർ ക്രമീകരിക്കുന്നത് നിങ്ങളുടെ ഉപകരണ അഡ്മിനിസ്ട്രേറ്റർ പ്രവർത്തനരഹിതമാക്കി"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"വാൾപേപ്പർ സജ്ജമാക്കി"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"വാൾപേപ്പറുകൾ കാണുന്നതിന് നിങ്ങൾക്ക് ഇന്റർനെറ്റ് കണക്ഷൻ ആവശ്യമാണ്. കണക്റ്റുചെയ്ത് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"നിലവിൽ ഹോം സ്ക്രീൻ വാൾപേപ്പർ ലഘുചിത്രം സജ്ജമാക്കിയിരിക്കുന്നു"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"നിലവിൽ ലോക്ക് സ്ക്രീൻ വാൾപേപ്പർ ലഘുചിത്രം സജ്ജമാക്കിയിരിക്കുന്നു"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"നിലവിൽ വാൾപേപ്പർ ലഘുചിത്രം സജ്ജമാക്കിയിരിക്കുന്നു"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"വാൾപേപ്പർ ലഘുചിത്രം"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"ഹോം സ്ക്രീൻ വാൾപേപ്പർ അടുത്തറിയുക"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"ലോക്ക് സ്ക്രീൻ വാൾപേപ്പർ അടുത്തറിയുക"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"പ്രതിദിന ഹോം സ്ക്രീൻ വാൾപേപ്പർ പുതുക്കുക"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"പ്രതിദിന വാൾപേപ്പർ പുതുക്കുക"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"പ്രതിദിന വാൾപേപ്പർ പുതുക്കുന്നു…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"പ്രതിദിന വാൾപേപ്പർ പുതുക്കിയെടുക്കുന്നത് പരാജയപ്പെട്ടു. നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"വാൾപേപ്പർ വിവര പാനൽ ചുരുക്കുക"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"വാൾപേപ്പർ വിവര പാനൽ വികസിപ്പിക്കുക"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"ഉപകരണത്തിലെ വാൾപേപ്പറുകൾ"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"ഉപകരണത്തിൽ"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android വാൾപേപ്പർ"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"സജീവ വാൾപേപ്പറുകൾ"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"എന്റെ ഫോട്ടോകൾ"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"എന്റെ ഫോട്ടോ"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"വാൾപേപ്പർ"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"അപ്ലിക്കേഷൻ ഇൻസ്‌റ്റാളുചെ‌യ്‌തിട്ടില്ല."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"മധ്യം"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"നടുവിൽ വലുപ്പം മാറ്റുക"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"വലിച്ചുനീട്ടുക"</string>
-</resources>

diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 38abe14..3f52526 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml

@@ -17,7 +17,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="5610614769724978966">"വാൾപേപ്പറുകൾ"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"വാൾപേപ്പറുകൾ"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"വാൾപേപ്പർ തിരഞ്ഞെടുക്കുക"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"വാൾപേപ്പർ സജ്ജമാക്കുക"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"വാൾപേപ്പർ സജ്ജമാക്കുന്നു…"</string>

diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
deleted file mode 100644
index 63ef1f9..0000000
--- a/res/values-mn-rMN/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Ханын зураг"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Ханын зураг сонгох"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Ханын зураг тохируулах"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Ханын зургийг тохируулж байна…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Дахин оролдох"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Ханын зургийг тохируулах боломжгүй байна."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Дэлгэцийн зургийг ачаалах боломжгүй байна. Зураг нь гэмтэлтэй буюу эсвэл ашиглах боломжгүй байна."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Одоогоор тохируулсан ханын зураг"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Өдөр тутмын ханын зураг"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Үндсэн нүүр"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Түгжигдсэн дэлгэц"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Нүүр хуудас болон түгжээ"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Ханын зураг тохируулах"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Үндсэн нүүр"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Түгжигдсэн дэлгэц"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Үндсэн нүүр болон түгжих дэлгэц"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Ханын зургийг эргүүлж байна"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Одоогийн ханын зургийг энд харуулахын тулд <xliff:g id="APP_NAME">%1$s</xliff:g> таны төхөөрөмжийн санд хандах шаардлагатай байна."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Одоогийн ханын зургийг энд харуулахын тулд Ханын зураг таны төхөөрөмжийн санд хандах шаардлагатай байна.\n\nЭнэ тохиргоог өөрчлөх бол Ханын зургийн аппын мэдээллийн Зөвшөөрөл хэсэгт очно уу."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Хандалтыг зөвшөөрөх"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Ханын зургийг эргүүлэх хөдөлгөөнт ханын зургийн үйлчилгээ"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Өдөр тутмын ханын зураг"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Асаахын тулд товшино уу"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Ханын зургийг өдөр бүр автоматаар солино. Тохируулгыг дуусгахын тулд дараагийн дэлгэцийн &lt;strong&gt;Ханын зураг тохируулах&lt;/strong&gt; гэснийг товшино уу."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Цаашдын ханын зургийг зөвхөн Wi-Fi-р татах"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Үргэлжлүүлэх"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Эхний ханын зургийг татаж байна…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Эхний ханын зургийг татах боломжгүй байна. Сүлжээний тохиргоогоо шалгаад дахин оролдоно уу."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Ханын зургийг өдөр бүр автоматаар солино"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Тохиргоо"</string>
-    <string name="explore" msgid="7468719504199497281">"Судлах"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Дараагийн ханын зураг"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Ханын зураг тохируулах тохиргоог энэ төхөөрөмжид идэвхгүй болгосон байна"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Таны төхөөрөмжийн админ ханын зураг тохируулах тохиргоог идэвхгүй болгосон байна"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Ханын зургийг амжилттай тохирууллаа"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Ханын зургийг харахын тулд танд интернэт холболт шаардлагатай. Интернэтэд холбогдоод дахин оролдоно уу."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Үндсэн нүүрэнд одоогоор тохируулсан ханын зургийн өнгөц зураг"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Түгжих дэлгэцэд одоогоор тохируулсан ханын зургийн өнгөц зураг"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Одоогоор тохируулсан ханын зургийн өнгөц зураг"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Ханын зургийн өнгөц зураг"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Үндсэн нүүрийн ханын зургийг судлах"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Түгжих дэлгэцийн ханын зургийг судлах"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Үндсэн нүүрийн өдөр тутмын ханын зургийг сэргээх"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Өдөр тутмын ханын зургийг сэргээх"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Өдөр тутмын ханын зургийг сэргээж байна…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Өдөр тутмын ханын зургийг сэргээж чадсангүй. Сүлжээний холболтоо шалгаад дахин оролдоно уу."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Ханын зургийн мэдээллийн самбарыг буулгах"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Ханын зургийн мэдээллийн самбарыг дэлгэх"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Төхөөрөмжийн ханын зураг"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Төхөөрөмжид хадгалсан"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Андройдын ханын зураг"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Хөдөлгөөнт ханын зураг"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Миний зураг"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Миний зураг"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Ханын зураг"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Аппыг суулгаагүй байна."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Гол хэсэг"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Голлуулж тайрах"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Сунгах"</string>
-</resources>

diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 63ef1f9..c771220 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Ханын зураг"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Ханын зураг"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Ханын зураг сонгох"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Ханын зураг тохируулах"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Ханын зургийг тохируулж байна…"</string>

diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
deleted file mode 100644
index b375a18..0000000
--- a/res/values-mr-rIN/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"वॉलपेपर"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"वॉलपेपर निवडा"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"वॉलपेपर सेट करा"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"वॉलपेपर सेट करत आहे…"</string>
-    <string name="try_again" msgid="8278874823700921234">"पुन्हा प्रयत्न करा"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"वॉलपेपर सेट करू शकत नाही."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"वॉलपेपर लोड करता आला नाही. इमेज करप्ट झालेली किंवा अनुपलब्ध आहे."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"सध्या सेट केलेला"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"दैनिक वॉलपेपर"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"होम स्क्रीन"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"लॉक स्क्रीन"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"होम आणि लॉक"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"वॉलपेपर सेट करा"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"होम स्क्रीन"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"लॉक स्क्रीन"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"होम स्क्रीन आणि लॉक स्क्रीन"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"फिरती इमेज वॉलपेपर"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"येथे सध्याचा वॉलपेपर दाखवण्यासाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला तुमच्या डिव्हाइसच्या स्टोरेजचा अॅक्सेस हवा आहे."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"येथे सध्याचा वॉलपेपर दाखवण्यासाठी, वॉलपेपरला तुमच्या डिव्हाइसच्या स्टोरेजचा अॅक्सेस हवा आहे.\n\nहे सेटिंग बदलण्यासाठी, वॉलपेपरच्या अॅप माहितीच्या परवानग्या भागावर जा."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"अॅक्सेस द्या"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"फिरत्या वॉलपेपरसाठी लाइव्ह वॉलपेपर सेवा"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"दैनिक वॉलपेपर"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"चालू करण्यासाठी टॅप करा"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"वॉलपेपर दररोज आपोआप बदलेल. सेटअप पूर्ण करण्यासाठी, पुढील स्क्रीनवर &lt;strong&gt;वॉलपेपर सेट करा&lt;/strong&gt; वर टॅप करा."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"भविष्यातील वॉलपेपर फक्त वाय-फायवरून डाउनलोड करा"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"सुरू ठेवा"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"पहिला वॉलपेपर डाउनलोड करत आहे…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"पहिला वॉलपेपर डाउनलोड करता आला नाही. कृपया तुमची नेटवर्क सेटिंग्ज तपासा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"वॉलपेपर दररोज आपोआप बदलेल"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"सेटिंग्ज"</string>
-    <string name="explore" msgid="7468719504199497281">"एक्सप्लोर करा"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"पुढील वॉलपेपर"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"या डिव्हाइसवर वॉलपेपर सेट करणे बंद केलेले आहे"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"तुमच्या डिव्हाइस अॅडमिनिस्ट्रेटरने वॉलपेपर सेट करणे बंद केले आहे"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"वॉलपेपर यशस्वीरीत्या सेट झाला"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"वॉलपेपर पाहण्यासाठी तुमच्याकडे इंटरनेट कनेक्शन असणे गरजेचे आहे. कृपया कनेक्ट करा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"सध्या होम स्क्रीन वॉलपेपर थंबनेल सेट केले आहे"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"सध्या लॉक स्क्रीन वॉलपेपर थंबनेल सेट केले आहे"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"सध्या वॉलपेपर थंबनेल सेट केले आहे"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"वॉलपेपर थंबनेल"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"होम स्क्रीन वॉलपेपर एक्सप्लोर करा"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"लॉक स्क्रीन वॉलपेपर एक्सप्लोर करा"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"दैनिक होम स्क्रीन वॉलपेपर रिफ्रेश करा"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"दैनिक वॉलपेपर रिफ्रेश करा"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"दैनिक वॉलपेपर रिफ्रेश करत आहे…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"दैनिक वॉलपेपर रिफ्रेश करता आला नाही. कृपया तुमचे नेटवर्क कनेक्शन तपासा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"वॉलपेपर माहिती पॅनल कोलॅप्स करा"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"वॉलपेपर माहिती पॅनल विस्तृत करा"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"डिव्हाइसवरील वॉलपेपर"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"डिव्हाइसवरील"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android वॉलपेपर"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"लाइव्ह वॉलपेपर"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"माझे फोटो"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"माझा फोटो"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"वॉलपेपर"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"अॅप इंस्टॉल केलेले नाही."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"मध्यभागी"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"मध्यभागी क्रॉप केलेले"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ताणा"</string>
-</resources>

diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index b375a18..d244573 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml

@@ -17,7 +17,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="5610614769724978966">"वॉलपेपर"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"वॉलपेपर"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"वॉलपेपर निवडा"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"वॉलपेपर सेट करा"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"वॉलपेपर सेट करत आहे…"</string>
@@ -35,7 +37,7 @@
     <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"होम स्क्रीन आणि लॉक स्क्रीन"</string>
     <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"फिरती इमेज वॉलपेपर"</string>
     <string name="permission_needed_explanation" msgid="139166837541426823">"येथे सध्याचा वॉलपेपर दाखवण्यासाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला तुमच्या डिव्हाइसच्या स्टोरेजचा अॅक्सेस हवा आहे."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"येथे सध्याचा वॉलपेपर दाखवण्यासाठी, वॉलपेपरला तुमच्या डिव्हाइसच्या स्टोरेजचा अॅक्सेस हवा आहे.\n\nहे सेटिंग बदलण्यासाठी, वॉलपेपरच्या अॅप माहितीच्या परवानग्या भागावर जा."</string>
+    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"येथे सध्याचा वॉलपेपर दाखवण्यासाठी, वॉलपेपरला तुमच्या डिव्हाइसच्या स्टोरेजचा अॅक्सेस हवा आहे.\n\nहे सेटिंग बदलण्यासाठी, वॉलपेपरच्या ॲप माहितीच्या परवानग्या भागावर जा."</string>
     <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"अॅक्सेस द्या"</string>
     <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"फिरत्या वॉलपेपरसाठी लाइव्ह वॉलपेपर सेवा"</string>
     <string name="daily_refresh_tile_title" msgid="3270456074558525091">"दैनिक वॉलपेपर"</string>
@@ -72,7 +74,7 @@
     <string name="my_photos_category_title" msgid="4294567122144565273">"माझे फोटो"</string>
     <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"माझा फोटो"</string>
     <string name="fallback_wallpaper_title" msgid="6154655421012506001">"वॉलपेपर"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"अॅप इंस्टॉल केलेले नाही."</string>
+    <string name="app_not_found" msgid="4431461707854088231">"ॲप इंस्टॉल केलेले नाही."</string>
     <string name="center_wallpaper_position" msgid="4166894762352288883">"मध्यभागी"</string>
     <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"मध्यभागी क्रॉप केलेले"</string>
     <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ताणा"</string>

diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
deleted file mode 100644
index f9c6d94..0000000
--- a/res/values-ms-rMY/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Kertas dinding"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Pilih kertas dinding"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Tetapkan Kertas Dinding"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Menetapkan kertas dinding…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Cuba lagi"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Tidak dapat menetapkan kertas dinding."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Tidak dapat memuatkan kertas dinding. Imej rosak atau tidak tersedia."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Ditetapkan pada masa ini"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Kertas dinding harian"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Skrin utama"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Kunci skrin"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Skrin Utama &amp; Kunci"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Tetapkan kertas dinding"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Skrin utama"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Kunci skrin"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Skrin utama dan kunci skrin"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Menggilirkan Kertas Dinding Imej"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Untuk memaparkan kertas dinding semasa di sini, <xliff:g id="APP_NAME">%1$s</xliff:g> memerlukan akses kepada storan peranti anda."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Untuk memaparkan kertas dinding semasa di sini, Kertas Dinding memerlukan akses kepada storan peranti anda.\n\nUntuk menukar tetapan ini, pergi ke kawasan Kebenaran bagi maklumat apl Kertas Dinding."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Benarkan akses"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Perkhidmatan kertas dinding langsung untuk menggilirkan kertas dinding"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Kertas dinding harian"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Ketik untuk menghidupkan"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Kertas dinding akan ditukar secara automatik setiap hari. Untuk menyelesaikan persediaan, ketik &lt;strong&gt;Tetapkan kertas dinding&lt;/strong&gt; pada skrin seterusnya."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Muat turun kertas dinding pada masa hadapan dengan menggunakan Wi-Fi sahaja"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Teruskan"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Memuat turun kertas dinding yang pertama…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Tidak dapat memuat turun kertas dinding yang pertama. Sila semak tetapan rangkaian anda dan cuba lagi."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Kertas dinding akan ditukar secara automatik setiap hari"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Tetapan"</string>
-    <string name="explore" msgid="7468719504199497281">"Teroka"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Kertas dinding seterusnya"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Menetapkan kertas dinding dilumpuhkan pada peranti ini"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Tetapan kertas dinding dilumpuhkan oleh pentadbir peranti anda"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Kertas dinding berjaya ditetapkan"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Anda memerlukan sambungan Internet untuk melihat kertas dinding. Sila sambung ke Internet, kemudian cuba lagi."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Lakaran kecil kertas dinding skrin utama yang ditetapkan pada masa ini"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Lakaran kecil kertas dinding kunci skrin yang ditetapkan pada masa ini"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Lakaran kecil kertas dinding yang ditetapkan pada masa ini"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Lakaran kecil kertas dinding"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Terokai kertas dinding skrin utama"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Terokai kertas dinding kunci skrin"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Muat semula kertas dinding skrin utama harian"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Muat semula kertas dinding harian"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Memuat semula kertas dinding harian…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Gagal memuat semula kertas dinding harian. Sila semak sambungan rangkaian anda dan cuba lagi."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Runtuhkan panel maklumat kertas dinding"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Kembangkan panel maklumat kertas dinding"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Kertas dinding pada peranti"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Pada peranti"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Kertas dinding Android"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Kertas dinding langsung"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Foto saya"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Foto saya"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Kertas dinding"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Apl tidak dipasang."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Tengah"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Pangkas ke tengah"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Regang"</string>
-</resources>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index f9c6d94..e1ba745 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Kertas dinding"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Kertas dinding"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Pilih kertas dinding"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Tetapkan Kertas Dinding"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Menetapkan kertas dinding…"</string>

diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
deleted file mode 100644
index 3619a5b..0000000
--- a/res/values-my-rMM/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"နောက်ခံပုံများ"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"နောက်ခံကို ရွေးပါ"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"နောက်ခံ သတ်မှတ်ပါ"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"နောက်ခံ သတ်မှတ်နေသည်…"</string>
-    <string name="try_again" msgid="8278874823700921234">"ထပ်စမ်းကြည့်ရန်"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"နောက်ခံ သတ်မှတ်၍မရပါ"</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"နောက်ခံကို ဖွင့်၍မရပါ။ ဤပုံသည် ပျက်နေပါသည် သို့မဟုတ် မရနိင်ပါ။"</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"လက်ရှိတွင် သတ်မှတ်ထားသည်"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"နေ့စဉ် နောက်ခံ"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"ပင်မစာမျက်နှာ"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"လော့ခ်ချထားချိန် မျက်နှာပြင်"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"ပင်မနှင့် လော့ခ်မျက်နှာပြင်"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"နောက်ခံ သတ်မှတ်ပါ"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"ပင်မစာမျက်နှာ"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"လော့ခ်ချထားချိန် မျက်နှာပြင်"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"ပင်မစာမျက်နှာနှင့် လော့ခ်စာမျက်နှာ"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"နောက်ခံပုံကို လှည့်နေသည်"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"ဤနေရာတွင် လက်ရှိနောက်ခံကို ပြသရန်အတွက် <xliff:g id="APP_NAME">%1$s</xliff:g> သည် သင့်စက်၏ သိုလှောင်ခန်းကို အသုံးပြုခွင့်လိုအပ်သည်။"</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"ဤနေရာတွင် လက်ရှိနောက်ခံကို ပြသရန်အတွက် Wallpapers သည် သင့်စက်၏ သိုလှောင်ခန်းကို အသုံးပြုခွင့်လိုအပ်သည်။\n\nဤဆက်တင်ကို ပြောင်းရန် Wallpapers ၏ အက်ပ်အချက်အလက်များထဲရှိ \'ခွင့်ပြုချက်များ\' ဧရိယာသို့ သွားပါ။"</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"အသုံးပြုခွင့်ပေးရန်"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"နောက်ခံများ လှည့်ရန်အတွက် သက်ဝင်နောက်ခံ ဝန်ဆောင်မှု"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"နေ့စဉ် နောက်ခံ"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"ဖွင့်ရန်တို့ပါ"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"နောက်ခံသည် နေ့စဉ်အလိုအလျောက် ပြောင်းပါမည်။ စနစ်ထည့်သွင်းမှုကို အဆုံးသတ်ရန် နောက်လာမည့် မျက်နှာပြင်တွင် &lt;strong&gt;နောက်ခံ သတ်မှတ်ရန်&lt;/strong&gt; ကို တို့ပါ။"</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"နောင်လာမည့် နောက်ခံများကို Wi-Fi ဖြင့်သာ ဒေါင်းလုဒ်လုပ်ပါ"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"ရှေ့ဆက်ရန်"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"ပထမဆုံးနောက်ခံကို ဒေါင်းလုဒ်လုပ်နေသည်…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"ပထမဆုံးနောက်ခံကို ဒေါင်းလုဒ်လုပ်၍ မရပါ။ သင့်ကွန်ရက်ဆက်တင်များကို စစ်ဆေးပြီး ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"နောက်ခံသည် နေ့စဉ်အလိုအလျောက် ပြောင်းပါမည်"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"ဆက်တင်များ"</string>
-    <string name="explore" msgid="7468719504199497281">"လေ့လာရန်"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"နောက်လာမည့် နောက်ခံ"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"ဤစက်တွင် နောက်ခံသတ်မှတ်ခြင်းကို ပိတ်ထားသည်"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"သင့်စက် စီမံခန့်ခွဲသူက နောက်ခံသတ်မှတ်ခြင်းကို ပိတ်ထားသည်"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"နောက်ခံ အောင်မြင်စွာ သတ်မှတ်ပြီးပါပြီ"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"နောက်ခံများကို ကြည့်ရန် \'အင်တာနက်\' ချိတ်ဆက်မှု လိုအပ်ပါသည်။ ချိတ်ဆက်ပြီး ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"လက်ရှိသတ်မှတ်ထားသည့် ပင်မစာမျက်နှာ နောက်ခံပုံသေး"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"လက်ရှိသတ်မှတ်ထားသည့် လော့ခ်ချထားချိန် မျက်နှာပြင် နောက်ခံပုံသေး"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"လက်ရှိသတ်မှတ်ထားသည့် နောက်ခံပုံသေး"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"နောက်ခံပုံသေး"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"ပင်မစာမျက်နှာနောက်ခံကို လေ့လာရန်"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"လော့ခ်ချထားချိန် မျက်နှာပြင် နောက်ခံကို လေ့လာရန်"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"နေ့စဉ်ပင်မစာမျက်နှာနောက်ခံကို ပြန်လည်စတင်ရန်"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"နေ့စဉ်နောက်ခံကို ပြန်လည် စတင်ရန်"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"နေ့စဉ်နောက်ခံကို ပြန်လည်စတင်နေသည်…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"နေ့စဉ် နောက်ခံကို ပြန်လည် စတင်ခြင်း မအောင်မြင်ပါ။ ကွန်ရက်ချိတ်ဆက်မှုကို စစ်ဆေးပြီး ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"နောက်ခံအချက်အလက် အကန့်ကို လျှော့ပြရန်"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"နောက်ခံအချက်အလက် အကန့်ကို ချဲ့ပြရန်"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"စက်ပေါ်ရှိ နောက်ခံများ"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"စက်ပေါ်ရှိ"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android နောက်ခံ"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"သက်ဝင်နောက်ခံများ"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"ကျွန်ုပ်၏ ဓာတ်ပုံများ"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"ကျွန်ုပ်၏ ဓာတ်ပုံ"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"နောက်ခံ"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"အက်ပ် ထည့်သွင်းမထားပါ။"</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"အလယ်"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"အလယ်တွင် ဖြတ်ညှိရန်"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ဆွဲဆန့်ရန်"</string>
-</resources>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 3619a5b..e4bbdd2 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -17,7 +17,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="5610614769724978966">"နောက်ခံပုံများ"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"နောက်ခံပုံများ"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"နောက်ခံကို ရွေးပါ"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"နောက်ခံ သတ်မှတ်ပါ"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"နောက်ခံ သတ်မှတ်နေသည်…"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cf3d215..3b8e234 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Bakgrunner"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Bakgrunner"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Velg bakgrunn"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Angi bakgrunn"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Angir bakgrunn …"</string>
@@ -52,7 +54,7 @@
     <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Valg av bakgrunn er slått av på denne enheten"</string>
     <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Enhetsadministratoren har slått av valg av bakgrunn"</string>
     <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Bakgrunnen ble angitt"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Du må ha Internett-tilkobling for å se bakgrunner. Koble til og prøv igjen."</string>
+    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Du må ha internettilkobling for å se bakgrunner. Koble til og prøv igjen."</string>
     <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Miniatyrbilde for den nåværende bakgrunnen på startskjermen"</string>
     <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Miniatyrbilde for den nåværende bakgrunnen på låseskjermen"</string>
     <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Miniatyrbilde for den nåværende bakgrunnen"</string>

diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
deleted file mode 100644
index 71fdb7f..0000000
--- a/res/values-ne-rNP/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"वालपेपरहरू"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"वालपेपर चयन गर्नुहोस्"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"वालपेपर सेट गर्नुहोस्"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"वालपेपर सेट गर्दै…"</string>
-    <string name="try_again" msgid="8278874823700921234">"फेरि प्रयास गर्नुहोस्‌"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"वालपेपर सेट गर्न सकिएन।"</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"वालपेपर लोड गर्न सकिएन। छवि या त त्रुटिपूर्ण छ वा उपलब्ध छैन।"</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"हाल सेट गरिएको"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"दैनिक वालपेपर"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"गृह स्क्रिन"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"लक स्क्रिन"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"गृह स्क्रिन &amp; लक स्क्रिन"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"वालपेपर सेट गर्नुहोस्"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"गृह स्क्रिन"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"लक स्क्रिन"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"गृह स्क्रिन र लक स्क्रिन"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"छवि परिवर्तन हुने वालपेपर"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"यहाँ हालको वालपेपर देखाउन <xliff:g id="APP_NAME">%1$s</xliff:g> लाई तपाईंको यन्त्रको भण्डारणमाथिको पहुँच अनिवार्य हुन्छ।"</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"यहाँ हालैको वालपेपर देखाउन वालपेपरहरूलाई तपाईंको यन्त्रको भण्डारणमाथिको पहुँच अनिवार्य हुन्छ।\n\nयो सेटिङ बदल्न वालपेपरहरूको अनुप्रयोगसम्बन्धी जानकारीमा रहेको अनुमति क्षेत्रमा जानुहोस्।"</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"पहुँच राख्न दिनुहोस्"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"परिवर्तन हुने वालपेपरसम्बन्धी सेवाका लागि लाइभ वालपेपरहरू"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"दैनिक वालपेपर"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"सक्रिय गर्न ट्याप गर्नुहोस्"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"वालपेपर हरेक दिन स्वतः परिवर्तन हुने छ। सेटअप सम्पन्न गर्न अर्को स्क्रिनमा &lt;strong&gt;वालपेपर सेट गर्नुहोस्‌&lt;/strong&gt;लाई ट्याप गर्नुहोस्।"</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"भविष्यमा केवल Wi-Fi मार्फत वालपेपरहरू डाउनलोड गर्नुहोस्"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"जारी राख्नुहोस्"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"पहिलो वालपेपर डाउनलोड गर्दै…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"पहिलो वालपेपर डाउनलोड गर्न सकिएन। कृपया आफ्ना नेटवर्कसम्बन्धी सेटिङहरूको जाँच गरी फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"वालपेपर हरेक दिन स्वतः परिवर्तन हुने छ"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"सेटिङहरू"</string>
-    <string name="explore" msgid="7468719504199497281">"अन्वेषण गर्नुहोस्"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"अर्को वालपेपर"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"यस यन्त्रमा वालपेपर सेट गर्ने सुविधालाई असक्षम पारिएको छ"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"तपाईंको यन्त्रको प्रशासकले वालपेपर सेट गर्ने सुविधालाई असक्षम पार्नुभएको छ"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"वालपेपर सफलतापूर्वक सेट गरियो"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"वालपेपरहरू हेर्न तपाईंसँग इन्टरनेट जडान हुनु आवश्यक हुन्छ। कृपया जडान गरेर फेरि प्रयास गर्नुहोस।"</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"हाल गृह स्क्रिनमा सेट गरिएको वालपेपरको थम्बनेल"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"हाल लक स्क्रिनमा सेट गरिएको वालपेपरको थम्बनेल"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"हाल सेट गरिएको वालपेपरको थम्बनेल"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"वालपेपरको थम्बनेल"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"गृह स्क्रिनको वालपेपरको अन्वेषण गर्नुहोस्"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"लक स्क्रिनको वालपेपरको अन्वेषण गर्नुहोस्"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"गृहपृष्ठको दैनिक वालपेपर पुनः ताजा गर्नुहोस्"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"दैनिक वालपेपर पुनः ताजा गर्नुहोस्"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"दैनिक वालपेपर पुनः ताजा गर्दै…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"दैनिक वालपेपर पुनः ताजा गर्न सकिएन। कृपया आफ्नो नेटवर्कको जडान जाँच गरी फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"वालपेपरसम्बन्धी जानकारीको प्यानललाई संक्षिप्त गर्नुहोस्"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"वालपेपरसम्बन्धी जानकारीको प्यानललाई विस्तृत गर्नुहोस्"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"यन्त्रमा रहेका वालपेपरहरू"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"यन्त्रका वालपेपर"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android वालपेपर"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"लाइभ वालपेपरहरू"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"मेरा तस्बिरहरू"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"मेरो तस्बिर"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"वालपेपर"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"अनुप्रयोग स्थापित छैन।"</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"मध्यभाग"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"मध्यभागमा क्रप गरिएको"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"तन्काइएको"</string>
-</resources>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 71fdb7f..d755731 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -17,7 +17,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="5610614769724978966">"वालपेपरहरू"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"वालपेपरहरू"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"वालपेपर चयन गर्नुहोस्"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"वालपेपर सेट गर्नुहोस्"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"वालपेपर सेट गर्दै…"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4a70e08..b53fda8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Achtergronden"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Achtergronden"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Achtergrond selecteren"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Achtergrond instellen"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Achtergrond instellen…"</string>

diff --git a/res/values-v26/colors.xml b/res/values-notnight-v26/colors.xml
similarity index 94%
rename from res/values-v26/colors.xml
rename to res/values-notnight-v26/colors.xml
index b66619a..5283cc6 100755
--- a/res/values-v26/colors.xml
+++ b/res/values-notnight-v26/colors.xml

@@ -15,7 +15,7 @@
 -->
 <resources>
     <color name="primary_color">#ffffff</color>
-    <color name="secondary_color">#eeeeee</color>
+    <color name="secondary_color">#f8f9fa</color>
     <color name="accent_color">@color/material_googblue500</color>
 
     <color name="status_bar_color">@color/secondary_color</color>

diff --git a/res/values-v26/picker_colors.xml b/res/values-notnight-v26/picker_colors.xml
similarity index 100%
rename from res/values-v26/picker_colors.xml
rename to res/values-notnight-v26/picker_colors.xml


diff --git a/res/values-v26/styles.xml b/res/values-notnight-v26/styles.xml
similarity index 100%
rename from res/values-v26/styles.xml
rename to res/values-notnight-v26/styles.xml


diff --git a/res/values-v27/styles.xml b/res/values-notnight-v27/styles.xml
similarity index 75%
rename from res/values-v27/styles.xml
rename to res/values-notnight-v27/styles.xml
index b3a7ccf..7c104f7 100755
--- a/res/values-v27/styles.xml
+++ b/res/values-notnight-v27/styles.xml

@@ -17,8 +17,8 @@
 
     <style name="WallpaperTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="colorControlActivated">?attr/colorPrimary</item>
-        <item name="colorControlNormal">@color/accent_color</item>
-        <item name="android:statusBarColor">@color/status_bar_color</item>
+        <item name="colorControlNormal">?attr/colorAccent</item>
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
         <item name="android:windowLightStatusBar">true</item>
 
         <item name="android:navigationBarColor">#ffffffff</item>
@@ -26,4 +26,8 @@
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
+    <style name="LightDialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar">
+        <item name="android:layout">@layout/abc_alert_dialog_material</item>
+        <item name="windowActionBar">false</item>
+    </style>
 </resources>

diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 591fd23..caa61dc 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml

@@ -17,7 +17,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="5610614769724978966">"ୱାଲପେପର୍"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"ୱାଲ୍‌ପେପର୍‌"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"ୱାଲପେପର୍‌ ଚୟନ କରନ୍ତୁ"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ୱାଲପେପର୍‍ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ୱାଲପେପର୍‌ ସେଟ୍ ହେଉଛି…"</string>

diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
deleted file mode 100644
index c62fa13..0000000
--- a/res/values-pa-rIN/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"ਵਾਲਪੇਪਰ"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"ਵਾਲਪੇਪਰ ਚੁਣੋ"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ਵਾਲਪੇਪਰ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ਵਾਲਪੇਪਰ ਸੈੱਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
-    <string name="try_again" msgid="8278874823700921234">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"ਵਾਲਪੇਪਰ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"ਵਾਲਪੇਪਰ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ। ਚਿੱਤਰ ਖਰਾਬ ਜਾਂ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"ਵਰਤਮਾਨ ਤੌਰ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"ਰੋਜ਼ਾਨਾ ਵਾਲਪੇਪਰ"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"ਹੋਮ ਸਕ੍ਰੀਨ"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"ਲਾਕ ਸਕ੍ਰੀਨ"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"ਹੋਮ ਸਕ੍ਰੀਨ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"ਵਾਲਪੇਪਰ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"ਹੋਮ ਸਕ੍ਰੀਨ"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"ਲਾਕ ਸਕ੍ਰੀਨ"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"ਹੋਮ ਸਕ੍ਰੀਨ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"ਬਦਲਣ ਵਾਲਾ ਚਿੱਤਰ ਵਾਲਪੇਪਰ"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"ਇੱਥੇ ਵਰਤਮਾਨ ਵਾਲਪੇਪਰ ਨੂੰ ਦਿਖਾਉਣ ਲਈ, <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਸਟੋਰੇਜ ਤੱਕ ਪਹੁੰਚ ਕਰਨੀ ਪਵੇਗੀ।"</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"ਇੱਥੇ ਵਰਤਮਾਨ ਵਾਲਪੇਪਰ ਨੂੰ ਦਿਖਾਉਣ ਲਈ, \'ਵਾਲਪੇਪਰ\' ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਸਟੋਰੇਜ ਤੱਕ ਪਹੁੰਚ ਕਰਨੀ ਪਵੇਗੀ।\n\nਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਦਲਣ ਲਈ, \'ਵਾਲਪੇਪਰ\' ਐਪ ਦੀ ਜਾਣਕਾਰੀ ਦੇ ਇਜਾਜ਼ਤਾਂ ਖੇਤਰ ਵਿੱਚ ਜਾਓ।"</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"ਪਹੁੰਚ ਕਰਨ ਦਿਓ"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"ਬਦਲਣ ਵਾਲੇ ਚਿੱਤਰ ਵਾਲਪੇਪਰਾਂ ਲਈ ਲਾਈਵ ਵਾਲਪੇਪਰ ਸੇਵਾ"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"ਰੋਜ਼ਾਨਾ ਵਾਲਪੇਪਰ"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"ਚਾਲੂ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"ਵਾਲਪੇਪਰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਹਰ ਦਿਨ ਬਦਲੇਗਾ। ਸੈੱਟਅੱਪ ਪੂਰਾ ਕਰਨ ਲਈ, ਅਗਲੀ ਸਕ੍ਰੀਨ \'ਤੇ &lt;strong&gt;ਵਾਲਪੇਪਰ ਸੈੱਟ ਕਰੋ&lt;/strong&gt; \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"ਭਵਿੱਖੀ ਵਾਲਪੇਪਰਾਂ ਨੂੰ ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ \'ਤੇ ਡਾਊਨਲੋਡ ਕਰੋ"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"ਪਹਿਲਾ ਵਾਲਪੇਪਰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"ਪਹਿਲਾ ਵਾਲਪੇਪਰ ਡਾਊਨਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਦੀ ਜਾਂਚ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"ਵਾਲਪੇਪਰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਹਰ ਦਿਨ ਬਦਲੇਗਾ"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="explore" msgid="7468719504199497281">"ਪੜਚੋਲ ਕਰੋ"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"ਅਗਲਾ ਵਾਲਪੇਪਰ"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"ਕਿਸੇ ਵਾਲਪੇਪਰ ਨੂੰ ਸੈੱਟ ਕਰਨਾ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"ਕਿਸੇ ਵਾਲਪੇਪਰ ਨੂੰ ਸੈੱਟ ਕਰਨਾ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"ਵਾਲਪੇਪਰ ਸਫਲਤਾਪੂਰਵਕ ਸੈੱਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"ਵਾਲਪੇਪਰਾਂ ਨੂੰ ਦੇਖਣ ਦੇ ਲਈ ਤੁਹਾਨੂੰ ਇੱਕ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਦੀ ਲੋੜ ਪਵੇਗੀ। ਕਿਰਪਾ ਕਰਕੇ ਕਨੈਕਟ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"ਵਰਤਮਾਨ ਤੌਰ \'ਤੇ ਸੈੱਟ ਕੀਤੇ ਹੋਮ ਸਕ੍ਰੀਨ ਵਾਲਪੇਪਰ ਦਾ ਲਘੂ-ਚਿੱਤਰ"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"ਵਰਤਮਾਨ ਤੌਰ \'ਤੇ ਸੈੱਟ ਕੀਤੇ ਲਾਕ ਸਕ੍ਰੀਨ ਵਾਲਪੇਪਰ ਦਾ ਲਘੂ-ਚਿੱਤਰ"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"ਵਰਤਮਾਨ ਤੌਰ \'ਤੇ ਸੈੱਟ ਕੀਤੇ ਵਾਲਪੇਪਰ ਦਾ ਲਘੂ-ਚਿੱਤਰ"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"ਵਾਲਪੇਪਰ ਦਾ ਲਘੂ-ਚਿੱਤਰ"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"ਹੋਮ ਸਕ੍ਰੀਨ ਵਾਲਪੇਪਰ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"ਲਾਕ ਸਕ੍ਰੀਨ ਵਾਲਪੇਪਰ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"ਰੋਜ਼ਾਨਾ ਹੋਮ ਸਕ੍ਰੀਨ ਵਾਲਪੇਪਰ ਨੂੰ ਰਿਫ੍ਰੈਸ਼ ਕਰੋ"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"ਰੋਜ਼ਾਨਾ ਵਾਲਪੇਪਰ ਰਿਫ੍ਰੈਸ਼ ਕਰੋ"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"ਰੋਜ਼ਾਨਾ ਵਾਲਪੇਪਰ ਰਿਫ੍ਰੈਸ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"ਰੋਜ਼ਾਨਾ ਵਾਲਪੇਪਰ ਰਿਫ੍ਰੈਸ਼ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"ਵਾਲਪੇਪਰ ਦੀ ਜਾਣਕਾਰੀ ਵਾਲਾ ਪੈਨਲ ਸਮੇਟੋ"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"ਵਾਲਪੇਪਰ ਦੀ ਜਾਣਕਾਰੀ ਵਾਲੇ ਪੈਨਲ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"ਡੀਵਾਈਸ ਵਿੱਚ ਮੌਜੂਦ ਵਾਲਪੇਪਰ"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"ਡੀਵਾਈਸ ਵਿੱਚ ਮੌਜੂਦ"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android ਵਾਲਪੇਪਰ"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"ਲਾਈਵ ਵਾਲਪੇਪਰ"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"ਮੇਰੀਆਂ ਫ਼ੋਟੋਆਂ"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"ਮੇਰੀ ਫ਼ੋਟੋ"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"ਵਾਲਪੇਪਰ"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"ਐਪ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਗਈ ਹੈ।"</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"ਵਿਚਕਾਰ"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"ਵਿਚਕਾਰੋਂ ਕਾਂਟ-ਛਾਂਟ ਕਰੋ"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"ਫੈਲਾਓ"</string>
-</resources>

diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index c62fa13..5b00fcf 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml

@@ -17,14 +17,16 @@
 
 <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="5610614769724978966">"ਵਾਲਪੇਪਰ"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"ਵਾਲਪੇਪਰ"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"ਵਾਲਪੇਪਰ ਚੁਣੋ"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ਵਾਲਪੇਪਰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"ਵਾਲਪੇਪਰ ਸੈੱਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="try_again" msgid="8278874823700921234">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="set_wallpaper_error_message" msgid="6819986999041085130">"ਵਾਲਪੇਪਰ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"</string>
     <string name="load_wallpaper_error_message" msgid="7913278480467707374">"ਵਾਲਪੇਪਰ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ। ਚਿੱਤਰ ਖਰਾਬ ਜਾਂ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"ਵਰਤਮਾਨ ਤੌਰ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
+    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"ਇਸ ਵੇਲੇ ਸੈੱਟ ਹੈ"</string>
     <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"ਰੋਜ਼ਾਨਾ ਵਾਲਪੇਪਰ"</string>
     <string name="home_screen_message" msgid="106444102822522813">"ਹੋਮ ਸਕ੍ਰੀਨ"</string>
     <string name="lock_screen_message" msgid="1534506081955058013">"ਲਾਕ ਸਕ੍ਰੀਨ"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ed5a5ec..c930640 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Tapety"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Tapety"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Wybierz tapetę"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Ustaw tapetę"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Ustawiam tapetę…"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 24cda80..36d0ac4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Imagens de fundo"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Imagens de fundo"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Selecionar imagem de fundo"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Definir imagem de fundo"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"A definir a imagem de fundo…"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e3c2491..81b894f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Planos de fundo"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Planos de fundo"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Selecione um plano de fundo"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Definir plano de fundo"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Definindo plano de fundo…"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ef379af..870fec8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Imagini de fundal"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Imagini de fundal"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Selectați o imagine de fundal"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Setați imaginea de fundal"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Se setează imaginea de fundal…"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0302faa..f0ebd8c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Обои"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Обои"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Выберите обои"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Установить как обои"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Установка обоев…"</string>
@@ -27,12 +29,12 @@
     <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Установлено как обои"</string>
     <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Обои на каждый день"</string>
     <string name="home_screen_message" msgid="106444102822522813">"Главный экран"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Экран блокировки"</string>
+    <string name="lock_screen_message" msgid="1534506081955058013">"Заблокированный экран"</string>
     <string name="home_and_lock_short_label" msgid="2937922943541927983">"Оба экрана"</string>
     <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Установка обоев"</string>
     <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Главный экран"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Экран блокировки"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Главный экран и экран блокировки"</string>
+    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Заблокированный экран"</string>
+    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Главный экран и заблокированный экран"</string>
     <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Автоматически меняющиеся обои"</string>
     <string name="permission_needed_explanation" msgid="139166837541426823">"Чтобы посмотреть текущие обои здесь, предоставьте приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" доступ к памяти устройства."</string>
     <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Чтобы посмотреть текущие обои здесь, предоставьте приложению \"Обои\" доступ к памяти устройства.\n\nЗакрыть доступ можно, нажав \"Настройки &gt; Приложения &gt; Обои &gt; Разрешения\"."</string>

diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
deleted file mode 100644
index 466ea3b..0000000
--- a/res/values-si-rLK/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"වෝල්පේපර"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"වෝල්පේපරයක් තෝරන්න"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"වෝල්පේපරය සකසන්න"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"වෝල්පේපරය සකසමින්…"</string>
-    <string name="try_again" msgid="8278874823700921234">"නැවත උත්සාහ කර."</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"වෝල්පේපරය සැකසීමට නොහැකිය."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"වෝල්පේපරය පූරණය කිරීමට නොහැකිය. මෙම රූපය හානි වී හෝ ලබා ගත නොහැකිව ඇත."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"දැනට සකසා ඇත"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"දෛනික වෝල්පේපරය"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"මුල් පිටු තිරය"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"අගුලු තිරය"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"මුල් පිටුව සහ අගුල"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"වෝල්පේපරය සකසන්න"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"මුල් පිටු තිරය"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"අගුලු තිරය"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"මුල් පිටු තිරය සහ අගුලු තිරය"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"කැරකෙන රූප වෝල්පේපරය"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"මෙහි වත්මන් වෝල්පේපරය සංදර්ශනය කිරීමට, <xliff:g id="APP_NAME">%1$s</xliff:g> හට ඔබේ උපාංගයේ ගබඩාව වෙත ප්‍රවේශය අවශ්‍යයි."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"මෙහි වත්මන් වෝල්පේපරය පෙන්වීමට, වෝල්පේපර වෙත ඔබගේ උපාංග ගබඩාව වෙත ප්‍රවේශය අවශ්‍යයි.\n\nමෙම සැකසීම වෙනස් කිරීමට, වෝල්පේපර යෙදුම් තොරතුරු වල අවසර වෙත යන්න."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"ප්‍රවේශය ඉඩ දෙන්න"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"කැරකෙන වෝල්පේපර සඳහා සජීවී වෝල්පේපර සේවාව"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"දෛනික වෝල්පේපරය"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"ක්‍රියාත්මක කිරීමට තට්ටු කරන්න"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"සෑම දිනකම වෝල්පේපරය ස්වයංක්‍රියව වෙනස් වනු ඇත. පිහිටුවීම අවසන් කිරීමට, ඊළඟ තිරය මත &lt;strong&gt;වෝල්පේපරය සකසන්න&lt;/strong&gt; තට්ටු කරන්න."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Wi-Fi හරහා පමණක් අනාගත වෝල්පේපර බාගන්න"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"ඉදිරියට යන්න"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"පළමු වෝල්පේපරය බාගනිමින්..."</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"පළමු වෝල්පේපරය බාගැනීමට නොහැකිය. කරුණාකර ඔබගේ ජාල සැකසීම් පරීක්ෂා කර නැවත උත්සාහ කරන්න."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"සෑම දිනකම වෝල්පේපරය ස්වයංක්‍රියව වෙනස් වනු ඇත"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"සැකසීම්"</string>
-    <string name="explore" msgid="7468719504199497281">"ගවේෂණය කරන්න"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"ඊළඟ වෝල්පේපරය"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"මෙම උපාංගය මත වෝල්පේපරයක් සැකසීම අබල කර ඇත"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"ඔබගේ පරිපාලක විසින් වෝල්පේපරයක් සැකසීම අබල කරන ලදී"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"වෝල්පේපරය සාර්ථකව සකසන ලදී"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"ඔබට බිතුපත් බැලීමට අන්තර්ජාල සබැඳුමක් අවශ්‍යයි. කරුණාකර සබැඳී නැවත උත්සාහ කරන්න."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"දැනට සකසා ඇති මුල් පිටු තිර වෝල්පේපර සිඟිති රුව"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"දැනට සකසා ඇති අගුලු තිර වෝල්පේපර සිඟිති රුව"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"දැනට සකසා ඇති වෝල්පේපර සිඟිති රුව"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"වෝල්පේපර සිඟිති රුව"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"මුල් පිටු තිර වෝල්පේපරය ගවේෂණය කරන්න"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"අගුලු තිර වෝල්පේපරය ගවේෂණය කරන්න"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"දිනපතා මුල් පිටු තිර වෝල්පේපරය නැවුම් කරන්න"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"දිනපතා වෝල්පේපරය නැවුම් කරන්න"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"දෛනික වෝල්පේපරය නැවුම් කරමින්…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"දෛනික වෝල්පේපරය යළි නැවුම් කිරීම අසාර්ථක විය. කරුණාකර ඔබගේ ජාල සම්බන්ධතාව පරික්ෂා කර නැවත උත්සාහ කරන්න."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"වෝල්පේපර තතු පැනලය හකුළුවන්න"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"වෝල්පේපර තතු පැනලය දිග හරින්න"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"උපාංගය-මත වෝල්පේපර"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"උපාංගයේ"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android වෝල්පේපරය"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"සජීවී වෝල්පේපර"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"මගේ ඡායාරූප"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"මගේ ඡායාරූපය"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"වෝල්පේපරය"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"යෙදුම ස්ථාපනය කර නැත."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"මැද"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"මැද කප්පාදු කිරීම"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"අදින්න"</string>
-</resources>

diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 466ea3b..9e6241a 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml

@@ -17,7 +17,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="5610614769724978966">"වෝල්පේපර"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"බිතුපත්"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"වෝල්පේපරයක් තෝරන්න"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"වෝල්පේපරය සකසන්න"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"වෝල්පේපරය සකසමින්…"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 36c7c16..7f06740 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Tapety"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Tapety"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Vyberte tapetu"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Nastaviť tapetu"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Nastavuje sa tapeta…"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e22e9d0..380e090 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Ozadja"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Ozadja"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Izberite ozadje"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Nastavi ozadje"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Nastavljanje ozadja …"</string>

diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
deleted file mode 100644
index f19cfad..0000000
--- a/res/values-sq-rAL/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Imazhet e sfondit"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Zgjidh imazhin e sfondit"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Cakto imazhin e sfondit"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Po cakton imazhin e sfondit..."</string>
-    <string name="try_again" msgid="8278874823700921234">"Provo sërish"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Nuk mund të caktojë imazhin e sfondit"</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Sfondi nuk mund të ngarkohet. Imazhi është i dëmtuar ose i padisponueshëm."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"E caktuar aktualisht"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Imazh sfondi i përditshëm"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Ekrani bazë"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Ekrani i kyçjes"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"\"Ekrani bazë\" dhe \"Kyçja\""</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Cakto imazhin e sfondit"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Ekrani bazë"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Ekrani i kyçjes"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Ekrani bazë dhe ekrani i kyçjes"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Imazh sfondi me rotacion"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Për të shfaqur imazhin aktual të sfondit këtu, <xliff:g id="APP_NAME">%1$s</xliff:g> ka nevojë për qasje te hapësira ruajtëse e pajisjes tënde."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Për të afishuar sfondin aktual këtu, \"Imazhet e sfondit\" kanë nevojë të kenë qasje në hapësirën ruajtëse të pajisjes sate.\n\nPër ta ndryshuar këtë cilësim, shko te zona \"Lejet\" në informacionin e aplikacionit \"Imazhet e sfondit\"."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Lejo qasjen"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Shërbimi i imazheve dinamike të sfondit për imazhet me rotacion"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Imazh sfondi i përditshëm"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Trokit për ta aktivizuar"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Imazhi i sfondit do të ndryshojë automatikisht çdo ditë. Për të përfunduar konfigurimin, trokit te &lt;strong&gt;Cakto imazhin e sfondit&lt;/strong&gt; në ekranin e radhës."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Shkarkoji imazhet e ardhshme të sfondit vetëm në Wi-Fi"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Vazhdo"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Po shkarkon imazhin e parë të sfondit…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Nuk mund të shkarkojë imazhin e parë të sfondit. Kontrollo cilësimet e rrjetit dhe provo sërish."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Imazhi i sfondit do të ndryshojë automatikisht çdo ditë"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Cilësime"</string>
-    <string name="explore" msgid="7468719504199497281">"Eksploro"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Imazhi tjetër i sfondit"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Vendosja e një imazhi sfondi është çaktivizuar në këtë pajisje"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Vendosja e një imazhi sfondi është çaktivizuar nga administratori yt"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Imazhi i sfondit u caktua me sukses"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Të nevojitet lidhje me internetin për të parë imazhet e sfondit. Lidhu dhe provo sërish."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Miniatura e imazhit të sfondit të ekranit kryesor e caktuar aktualisht"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Miniatura e imazhit të sfondit të ekranit të kyçjes e caktuar aktualisht"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Miniatura e imazhit të sfondit e caktuar aktualisht"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Miniatura e imazhit të sfondit"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Eksploro imazhin të sfondit të ekranit kryesor"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Eksploro imazhin të sfondit të ekranit të kyçjes"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Rifresko imazhin e përditshëm të sfondit të ekranit kryesor"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Rifresko imazhin e përditshëm të sfondit"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Po rifreskon imazhin e përditshëm të sfondit..."</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Rifreskimi i imazhit të përditshëm të sfondit dështoi. Kontrollo lidhjen e rrjetit dhe provo përsëri."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Palos panelin e informacionit të imazhit të sfondit"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Zgjero panelin e informacionit të imazhit të sfondit"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Imazhet e sfondit në pajisje"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Në pajisje"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Imazhi i sfondit Android"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Imazhe sfondi dinamike"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Fotografitë e mia"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Fotografia ime"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Imazhi i sfondit"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Aplikacioni nuk është i instaluar."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Qendror"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Prerje qendrore"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"E tendosur"</string>
-</resources>

diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index f19cfad..b301e84 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Imazhet e sfondit"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Imazhet e sfondit"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Zgjidh imazhin e sfondit"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Cakto imazhin e sfondit"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Po cakton imazhin e sfondit..."</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4d22c0b..f4132a6 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Позадине"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Позадине"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Изаберите позадину"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Подеси позадину"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Подешава се позадина…"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ad99ca0..10379ad 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Bakgrunder"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Bakgrunder"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Välj bakgrund"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Använd som bakgrund"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Ställer in bakgrund …"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 19b732d..8b83051 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Mandhari"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Mandhari"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Chagua mandhari"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Weka Mandhari"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Inaweka mandhari..."</string>

diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
deleted file mode 100644
index 31adda2..0000000
--- a/res/values-ta-rIN/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"வால்பேப்பர்கள்"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"வால்பேப்பரைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"வால்பேப்பரை அமை"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"வால்பேப்பரை அமைக்கிறது…"</string>
-    <string name="try_again" msgid="8278874823700921234">"மீண்டும் முயல்க"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"வால்பேப்பரை அமைக்க முடியவில்லை."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"வால்பேப்பரை ஏற்ற முடியவில்லை. படம் சிதைந்துவிட்டது அல்லது இல்லை."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"தற்போது அமைத்துள்ள வால்பேப்பர்"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"தினசரி வால்பேப்பர்"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"முகப்புத் திரை"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"பூட்டுத் திரை"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"முகப்பு &amp; பூட்டு"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"வால்பேப்பரை அமைத்தல்"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"முகப்புத் திரை"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"பூட்டுத் திரை"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"முகப்புத் திரையும் பூட்டுத் திரையும்"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"சுழலும் பட வால்பேப்பர்"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"இந்த வால்பேப்பரை இங்கே காட்ட, <xliff:g id="APP_NAME">%1$s</xliff:g> பயன்பாட்டிற்கு உங்கள் சாதனத்தின் சேமிப்பகத்திற்கான அணுகல் தேவை."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"இந்த வால்பேப்பரை இங்கே காட்ட, வால்பேப்பர்களுக்கு உங்கள் சாதனத்தின் சேமிப்பகத்திற்கான அணுகல் தேவை.\n\nஇந்த அமைப்பை மாற்ற, வால்பேப்பர்களின் பயன்பாட்டுத் தகவல் பக்கத்தில் உள்ள அனுமதிகள் பகுதிக்குச் செல்லவும்."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"அணுகலை அனுமதி"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"சுழலும் வால்பேப்பர்களுக்கான லைவ் வால்பேப்பர் சேவை"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"தினசரி வால்பேப்பர்"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"ஆன் செய்ய, தட்டவும்"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"ஒவ்வொரு நாளும் வால்பேப்பர் தானாகவே மாறும். அமைவை முடிக்க, அடுத்த திரையிலுள்ள &lt;strong&gt;வால்பேப்பரை அமை&lt;/strong&gt; என்பதைத் தட்டவும்."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"எதிர்காலத்தில், வைஃபை மூலமாக மட்டும் வால்பேப்பரைப் பதிவிறக்கு"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"தொடர்க"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"முதல் வால்பேப்பரைப் பதிவிறக்குகிறது…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"முதல் வால்பேப்பரைப் பதிவிறக்க முடியவில்லை. உங்கள் நெட்வொர்க் அமைப்புகளைச் சரிபார்த்து, மீண்டும் முயலவும்."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"ஒவ்வொரு நாளும் வால்பேப்பர் தானாகவே மாறும்"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"அமைப்புகள்"</string>
-    <string name="explore" msgid="7468719504199497281">"மேலும் அறிக"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"அடுத்த வால்பேப்பர்"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"இந்தச் சாதனத்தில் வால்பேப்பர் அமைவு முடக்கப்பட்டுள்ளது"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"வால்பேப்பர் அமைவைச் சாதன நிர்வாகி முடக்கியுள்ளார்"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"வால்பேப்பர் அமைக்கப்பட்டது"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"வால்பேப்பர்களைப் பார்க்க, இணைய இணைப்புத் தேவை. இணையத்துடன் இணைத்து, மீண்டும் முயலவும்."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"தற்போது அமைக்கப்பட்டுள்ள முகப்புத் திரை வால்பேப்பரின் சிறு படம்"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"தற்போது அமைக்கப்பட்டுள்ள பூட்டுத் திரை வால்பேப்பரின் சிறு படம்"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"தற்போது அமைக்கப்பட்டுள்ள வால்பேப்பரின் சிறு படம்"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"வால்பேப்பரின் சிறு படம்"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"முகப்புத் திரை வால்பேப்பர் பற்றி மேலும் அறிவதற்கான பட்டன்"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"பூட்டுத் திரை வால்பேப்பர் பற்றி மேலும் அறிவதற்கான பட்டன்"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"முகப்புத் திரையில் தினசரி வால்பேப்பரைப் புதுப்பிக்கும் பட்டன்"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"தினசரி வால்பேப்பரைப் புதுப்பிக்கும் பட்டன்"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"தினசரி வால்பேப்பரைப் புதுப்பிக்கிறது…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"தினசரி வால்பேப்பரைப் புதுப்பிக்க முடியவில்லை. நெட்வொர்க் இணைப்பைச் சரிபார்த்து, மீண்டும் முயலவும்."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"வால்பேப்பரின் தகவல் பேனலைச் சுருக்கும் பட்டன்"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"வால்பேப்பரின் தகவல் பேனலை விரிவாக்கும் பட்டன்"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"சாதனத்திலுள்ள வால்பேப்பர்கள்"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"சாதனத்தில் சேமித்தவை"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android வால்பேப்பர்"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"லைவ் வால்பேப்பர்கள்"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"எனது படங்கள்"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"எனது படம்"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"வால்பேப்பர்"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"பயன்பாடு நிறுவப்படவில்லை."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"மையம்"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"மையமாகச் செதுக்கு"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"திரையில் பொருந்தும்படி விரி"</string>
-</resources>

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 31adda2..3152b87 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml

@@ -17,7 +17,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="5610614769724978966">"வால்பேப்பர்கள்"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Wallpapers"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"வால்பேப்பரைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"வால்பேப்பரை அமை"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"வால்பேப்பரை அமைக்கிறது…"</string>

diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
deleted file mode 100644
index 7c2274f..0000000
--- a/res/values-te-rIN/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"వాల్‌పేపర్‌లు"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"వాల్‌పేపర్‌ను ఎంచుకోండి"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"వాల్‌పేపర్‌ను సెట్ చేయి"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"వాల్‌పేపర్‌ను సెట్ చేస్తోంది…"</string>
-    <string name="try_again" msgid="8278874823700921234">"మళ్లీ ప్రయత్నించు"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"వాల్‌పేపర్‌ను సెట్ చేయడం సాధ్యపడలేదు."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"వాల్‌పేపర్‌ను లోడ్ చేయలేకపోయాము. చిత్రం పాడై ఉండవచ్చు లేదా అందుబాటులో లేకపోవచ్చు."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"ప్రస్తుతం సెట్ చేసినది"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"రోజువారీ వాల్‌పేపర్"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"హోమ్ స్క్రీన్"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"లాక్ స్క్రీన్"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"హోమ్ &amp; లాక్"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"వాల్‌పేపర్‌ను సెట్ చేయండి"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"హోమ్ స్క్రీన్"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"లాక్ స్క్రీన్"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"హోమ్ స్క్రీన్ మరియు లాక్ స్క్రీన్"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"చిత్ర వాల్‌పేపర్‌ను వంతుల వారీగా మార్చడం"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"ప్రస్తుత వాల్‌పేపర్‌ని ఇక్కడ ప్రదర్శించడానికి, <xliff:g id="APP_NAME">%1$s</xliff:g>కి మీ పరికర నిల్వ యొక్క యాక్సెస్ అవసరమవుతుంది."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"ఇక్కడ ప్రస్తుత వాల్‌పేపర్‌ను ప్రదర్శించడానికి, వాల్‌పేపర్‌‌లకు మీ పరికర నిల్వ యాక్సెస్ అవసరం.\n\nఈ సెట్టింగ్‌ను మార్చడానికి, వాల్‌పేపర్‌ల యాప్ సమాచారం యొక్క అనుమతుల ప్రాంతానికి వెళ్లండి."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"యాక్సెస్‌ని ఇవ్వండి"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"వాల్‌పేపర్‌లను వంతుల వారీగా మార్చడం లైవ్ వాల్‌పేపర్ సేవ"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"రోజువారీ వాల్‌పేపర్"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"ఆన్ చేయడానికి నొక్కండి"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"వాల్‌పేపర్ ప్రతి రోజు ఆటోమేటిక్‌గా మారుతుంది. సెటప్‌ను ముగించడానికి, తదుపరి స్క్రీన్‌లో &lt;strong&gt;వాల్ పేపర్‌ను సెట్ చేయి&lt;/strong&gt;ని నొక్కండి."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"భవిష్యత్తులో వాల్‌పేపర్‌లను Wi-Fiలో ఉన్నప్పుడు మాత్రమే డౌన్‌లోడ్ చేయండి"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"కొనసాగించు"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"మొదటి వాల్‌పేపర్‌ను డౌన్‌లోడ్ చేస్తోంది…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"మొదటి వాల్‌పేపర్‌ను డౌన్‌లోడ్ చేయలేకపోయింది. దయచేసి మీ నెట్‌వర్క్ సెట్టింగ్‌లను తనిఖీ చేసి, ఆపై మళ్లీ ప్రయత్నించండి."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"వాల్‌పేపర్ ప్రతి రోజు ఆటోమేటిక్‌గా మారుతుంది"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"సెట్టింగ్‌లు"</string>
-    <string name="explore" msgid="7468719504199497281">"అన్వేషించు"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"తదుపరి వాల్‌పేపర్"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"ఈ పరికరంలో వాల్‌పేపర్‌ను సెట్ చేయడం నిలిపివేయబడింది"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"మీ పరికర నిర్వాహకులు వాల్‌పేపర్‌ను సెట్ చేయడం నిలిపివేసారు"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"వాల్‌పేపర్ విజయవంతంగా సెట్ చేయబడింది"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"వాల్‌పేపర్‌లను చూడాలంటే మీరు ఇంటర్నెట్ కనెక్షన్‌ని కలిగి ఉండాలి. దయచేసి కనెక్ట్ చేసి, మళ్లీ ప్రయత్నించండి."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"ప్రస్తుతం సెట్ చేసిన హోమ్ స్క్రీన్ వాల్‌పేపర్ సూక్ష్మచిత్రం"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"ప్రస్తుతం సెట్ చేసిన లాక్ స్క్రీన్ వాల్‌పేపర్ సూక్ష్మచిత్రం"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"ప్రస్తుతం సెట్ చేసిన వాల్‌పేపర్ సూక్ష్మచిత్రం"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"వాల్‌పేపర్ సూక్ష్మచిత్రం"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"హోమ్ స్క్రీన్ వాల్‌పేపర్‌ను అన్వేషిస్తుంది"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"లాక్ స్క్రీన్ వాల్‌పేపర్‌ను అన్వేషిస్తుంది"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"రోజువారీ హోమ్ స్క్రీన్ వాల్‌పేపర్‌ను రిఫ్రెష్ చేస్తుంది"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"రోజువారీ వాల్‌పేపర్‌ను రిఫ్రెష్ చేస్తుంది"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"రోజువారీ వాల్‌పేపర్‌ను రిఫ్రెష్ చేస్తోంది…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"రోజువారీ వాల్‌పేపర్‌ను రిఫ్రెష్ చేయడంలో విఫలమైంది. దయచేసి మీ నెట్‌వర్క్ కనెక్షన్‌ను తనిఖీ చేసుకొని, ఆపై మళ్లీ ప్రయత్నించండి."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"వాల్‌పేపర్ సమాచార ప్యానెల్‌ను కుదిస్తుంది"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"వాల్‌పేపర్ సమాచార ప్యానెల్‌ను విస్తరింపజేస్తుంది"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"పరికరంలో వాల్‌పేపర్‌లు"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"పరికరంలో"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android వాల్‌పేపర్"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"లైవ్ వాల్‌పేపర్‌లు"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"నా ఫోటోలు"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"నా ఫోటో"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"వాల్‌పేపర్"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"యాప్ ఇన్‌స్టాల్ చేయబడలేదు."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"మధ్య"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"మధ్యన కత్తిరించు"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"విస్తరించు"</string>
-</resources>

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 7c2274f..6101ab2 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml

@@ -17,7 +17,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="5610614769724978966">"వాల్‌పేపర్‌లు"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"వాల్‌పేపర్‌లు"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"వాల్‌పేపర్‌ను ఎంచుకోండి"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"వాల్‌పేపర్‌ను సెట్ చేయి"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"వాల్‌పేపర్‌ను సెట్ చేస్తోంది…"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0d292f9..8f4e001 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -17,7 +17,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="5610614769724978966">"วอลเปเปอร์"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"วอลเปเปอร์"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"เลือกวอลเปเปอร์"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"ตั้งค่าวอลเปเปอร์"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"กำลังตั้งค่าวอลเปเปอร์…"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 7703c1e..e1348fb 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Mga Wallpaper"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Mga Wallpaper"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Pumili ng wallpaper"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Itakda na Wallpaper"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Itinatakda ang wallpaper…"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9778dbe..bbbe10b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Duvar kağıtları"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Duvar kağıtları"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Duvar kağıdı seçin"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Duvar Kağıdını Ayarla"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Duvar kağıdı ayarlanıyor…"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 667bafb..4abd4cc 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Фонові малюнки"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Фонові малюнки"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Виберіть фоновий малюнок"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Зробити фоновим малюнком"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Налаштування фонового малюнка…"</string>

diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
deleted file mode 100644
index 04ffcff..0000000
--- a/res/values-ur-rPK/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"وال پیپرز"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"وال پیپر منتخب کریں"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"وال پیپر سیٹ کریں"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"وال پیپر سیٹ ہو رہا ہے…"</string>
-    <string name="try_again" msgid="8278874823700921234">"دوبارہ کوشش کریں"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"وال پیپر سیٹ کرنے سے قاصر۔"</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"وال پیپر لوڈ کرنے سے قاصر۔ تصویر یا تو خراب ہو گئی ہے یا دستیاب نہیں ہے۔"</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"فی الحال سیٹ کردہ"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"روزانہ وال پیپر"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"ہوم اسکرین"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"مقفل اسکرین"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"ہوم اور لاک"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"وال پیپر سیٹ کریں"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"ہوم اسکرین"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"مقفل اسکرین"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"ہوم اسکرین اور مقفل اسکرین"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"گردشی تصویری وال پیپر"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"موجودہ وال پیپر یہاں ڈسپلے کرنے کے لیے، <xliff:g id="APP_NAME">%1$s</xliff:g> کو آپ کے آلہ کے اسٹوریج تک رسائی درکار ہے۔"</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"یہاں موجودہ وال پیپر ڈسپلے کرنے کے لیے، وال پیپرز کو آپ کے آلہ کے اسٹوریج تک رسائی درکار ہے۔\n\nاس ترتیب کو بدلنے کے لیے، وال پیپرز کی ایپ کی معلومات کی اجازتوں کے ایریا میں جائیں۔"</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"رسائی کی اجازت دیں"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"گردشی وال پیپرز کے لیے لائیو وال پیپر کی سروس"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"روزانہ وال پیپر"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"آن کرنے کے لیے تھپتھپائیں"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"‏وال پیپر ہر روز خودکار طور پر تبدیل ہو جائے گا۔ سیٹ اپ مکمل کرنے کے لیے، اگلی اسکرین پر ‎&lt;strong&gt;‎وال پیپر سیٹ کریں‎&lt;/strong&gt;‎ پر تھپتھپائیں۔"</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"‏مستقبل میں وال پیپرز صرف Wi-Fi پر ڈاؤن لوڈ کریں"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"جاری رکھیں"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"پہلا وال پیپر ڈاؤن لوڈ ہو رہا ہے…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"پہلا وال پیپر ڈاؤن لوڈ کرنے سے قاصر۔ براہ کرم اپنے نیٹ ورک کی ترتیبات چیک کر کے دوبارہ کوشش کریں۔"</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"وال پیپر ہر روز خودکار طور پر تبدیل ہو جائے گا"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"ترتیبات"</string>
-    <string name="explore" msgid="7468719504199497281">"دریافت کریں"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"اگلا وال پیپر"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"اس آلہ پر وال پیپر سیٹ کرنا غیر فعال ہے"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"وال پیپر سیٹ کرنا آپ کے آلہ کے منتظم کی طرف سے غیر فعال ہے"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"وال پیپر کامیابی سے سیٹ ہو گیا"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"وال پیپرز دیکھنے کے لیے آپ کو ایک انٹرنیٹ کنکشن درکار ہے۔ براہ کرم منسلک کر کے دوبارہ کوشش کریں۔"</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"فی الحال سیٹ کردہ ہوم اسکرین وال پیپر کا تھمب نیل"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"فی الحال سیٹ کردہ مقفل اسکرین وال پیپر کا تھمب نیل"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"فی الحال سیٹ کردہ وال پیپر کا تھمب نیل"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"وال پیپر کا تھمب نیل"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"ہوم اسکرین وال پیپر دریافت کریں"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"مقفل اسکرین وال پیپر دریافت کریں"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"روزانہ ہوم اسکرین کا وال پیپر ریفریش کریں"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"روزانہ وال پیپر ریفریش کریں"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"روزانہ وال پیپر ریفریش ہو رہا ہے…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"روزانہ وال پیپر ریفریش کرنے میں ناکام۔ براہ کرم اپنا نیٹ ورک کنکشن چیک کر کے دوبارہ کوشش کریں۔"</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"وال پیپر کے معلوماتی پینل کو سکیڑیں"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"وال پیپر کا معلوماتی پینل پھیلائیں"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"آلہ میں اسٹور کردہ وال پیپرز"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"آلہ پر اسٹور کردہ"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"‏Android وال پیپر"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"لائیو وال پیپرز"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"میری تصاویر"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"میری تصویر"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"وال پیپر"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"ایپ انسٹال نہیں ہے۔"</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"مرکز"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"مرکزی تراش"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"پھیلائیں"</string>
-</resources>

diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 04ffcff..c496290 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml

@@ -17,7 +17,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="5610614769724978966">"وال پیپرز"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"وال پیپرز"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"وال پیپر منتخب کریں"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"وال پیپر سیٹ کریں"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"وال پیپر سیٹ ہو رہا ہے…"</string>

diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
deleted file mode 100644
index fb11d14..0000000
--- a/res/values-uz-rUZ/strings.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2017 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="5610614769724978966">"Fon rasmlari"</string>
-    <string name="select_wallpaper_label" msgid="3026032670158694582">"Fon rasmini tanlang"</string>
-    <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Fonga rasm o‘rnatish"</string>
-    <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Fonga rasm o‘rnatilmoqda…"</string>
-    <string name="try_again" msgid="8278874823700921234">"Qaytadan"</string>
-    <string name="set_wallpaper_error_message" msgid="6819986999041085130">"Fonga rasm o‘rnatib bo‘lmadi."</string>
-    <string name="load_wallpaper_error_message" msgid="7913278480467707374">"Fon rasmi yuklanmadi. Rasm buzilgan yoki mavjud emas."</string>
-    <string name="static_wallpaper_presentation_mode_message" msgid="417940227049360906">"Hozirda o‘rnatilgan"</string>
-    <string name="rotating_wallpaper_presentation_mode_message" msgid="3361676041605733288">"Kunlik fon rasmi"</string>
-    <string name="home_screen_message" msgid="106444102822522813">"Bosh ekran"</string>
-    <string name="lock_screen_message" msgid="1534506081955058013">"Ekran qulfi"</string>
-    <string name="home_and_lock_short_label" msgid="2937922943541927983">"Bosh ekran va ekran qulfi"</string>
-    <string name="set_wallpaper_dialog_message" msgid="6114951028768599417">"Fonga rasm o‘rnatish"</string>
-    <string name="set_wallpaper_home_screen_destination" msgid="7315594722013109354">"Bosh ekran"</string>
-    <string name="set_wallpaper_lock_screen_destination" msgid="6224685559375417945">"Ekran qulfi"</string>
-    <string name="set_wallpaper_both_destination" msgid="6967226064958263939">"Bosh ekran va qulf ekrani"</string>
-    <string name="no_backup_image_wallpaper_label" msgid="6316627676107284851">"Fon rasmlarini aylantirish"</string>
-    <string name="permission_needed_explanation" msgid="139166837541426823">"Bu yerda joriy fon rasmini chiqarish uchun <xliff:g id="APP_NAME">%1$s</xliff:g> xizmatiga qurilmangiz xotirasiga kirishi uchun ruxsat lozim."</string>
-    <string name="permission_needed_explanation_go_to_settings" msgid="3923551582092599609">"Bu yerda joriy fon rasmini chiqarish uchun Fon rasmlari xizmatiga qurilmaning xotirasiga kirishi uchun ruxsat zarur.\n\nBu parametrni o‘zgartirish uchun Fon rasmlari ilova ma’lumotlaridagi Ruxsatlar sahifasiga kiring."</string>
-    <string name="permission_needed_allow_access_button_label" msgid="1943133660612924306">"Ruxsat berish"</string>
-    <string name="no_backup_image_wallpaper_description" msgid="8303268619408738057">"Fon rasmlarini aylantirish uchun jonli fon xizmati"</string>
-    <string name="daily_refresh_tile_title" msgid="3270456074558525091">"Kunlik fon rasmi"</string>
-    <string name="daily_refresh_tile_subtitle" msgid="3976682014885446443">"Yoqish uchun bosing"</string>
-    <string name="start_rotation_dialog_body_live_wallpaper_needed" msgid="5132580257563846082">"Fon rasmlari har kuni avtomatik ravishda o‘zgarib turadi. Sozlashni yakunlash uchun keyingi ekranda &lt;strong&gt;Fonga rasm o‘rnatish&lt;/strong&gt; tugmasini bosing."</string>
-    <string name="start_rotation_dialog_wifi_only_option_message" msgid="3126269859713666225">"Yangi fon rasmlari faqat Wi-Fi orqali yuklab olinsin"</string>
-    <string name="start_rotation_dialog_continue" msgid="276678987852274872">"Keyingisi"</string>
-    <string name="start_rotation_progress_message" msgid="7872623873682262083">"Birinchi fon rasmi yuklab olinmoqda…"</string>
-    <string name="start_rotation_error_message" msgid="3053799836719618972">"Birinchi fon rasmi yuklab olinmadi. Tarmoq sozlamalarini tekshirib, qaytadan urining."</string>
-    <string name="start_rotation_dialog_body" msgid="7903554799046364916">"Fon rasmi har kuni avtomatik ravishda almashib turadi"</string>
-    <string name="settings_button_label" msgid="8724734130079207955">"Sozlamalar"</string>
-    <string name="explore" msgid="7468719504199497281">"Batafsil"</string>
-    <string name="next_wallpaper" msgid="3911873152952596232">"Keyingi fon rasmi"</string>
-    <string name="wallpaper_disabled_message" msgid="7309484130562148185">"Fon rasmini o‘rnatish bu qurilmada bloklangan"</string>
-    <string name="wallpaper_disabled_by_administrator_message" msgid="1551430406714747884">"Fon rasmini o‘rnatish qurilma administratori tomonidan bloklangan"</string>
-    <string name="wallpaper_set_successfully_message" msgid="2958998799111688578">"Fon rasmi o‘rnatildi"</string>
-    <string name="wallpapers_unavailable_offline_message" msgid="8136405438621689532">"Fon rasmlarini ko‘rish uchun internet aloqasi kerak. Ulanib, qaytadan urining."</string>
-    <string name="currently_set_home_wallpaper_thumbnail" msgid="4022381436821898917">"Hozirda bosh ekranga o‘rnatilgan fon rasmi eskizi"</string>
-    <string name="currently_set_lock_wallpaper_thumbnail" msgid="2094209303934569997">"Hozirda ekran qulfi uchun sozlangan fon rasmi eskizi"</string>
-    <string name="currently_set_wallpaper_thumbnail" msgid="8651887838745545107">"Hozirda o‘rnatilgan fon rasmi eskizi"</string>
-    <string name="wallpaper_thumbnail" msgid="569931475923605974">"Fon rasmi eskizi"</string>
-    <string name="explore_home_screen" msgid="8756346794535765482">"Bosh ekran fon rasmi haqida batafsil"</string>
-    <string name="explore_lock_screen" msgid="268938342103703665">"Ekran qulfi fon rasmi haqida batafsil"</string>
-    <string name="refresh_daily_wallpaper_home_content_description" msgid="2770445044556164259">"Kunlik bosh ekran fon rasmini yangilash"</string>
-    <string name="refresh_daily_wallpaper_content_description" msgid="4362142658237147583">"Kunlik fon rasmini yangilash"</string>
-    <string name="refreshing_daily_wallpaper_dialog_message" msgid="1975910873362855761">"Kunlik fon rasmi yangilanmoqda…"</string>
-    <string name="refresh_daily_wallpaper_failed_message" msgid="4749879993812557166">"Kunlik fon rasmi yangilanmadi. Internet aloqasini tekshiring va qaytadan urining."</string>
-    <string name="collapse_attribution_panel" msgid="4367971404848122275">"Fon rasmi haqidagi axborot panelini yopish"</string>
-    <string name="expand_attribution_panel" msgid="6975094181456095915">"Fon rasmi haqidagi axborot panelini ochish"</string>
-    <string name="on_device_wallpapers_category_title" msgid="805819102071369004">"Qurilmadagi fon rasmlari"</string>
-    <string name="on_device_wallpapers_category_title_desktop" msgid="316919420410065369">"Qurilmadagi"</string>
-    <string name="on_device_wallpaper_title" msgid="5262564748034629524">"Android fon rasmi"</string>
-    <string name="live_wallpapers_category_title" msgid="1814374812192366349">"Jonli fon rasmlari"</string>
-    <string name="my_photos_category_title" msgid="4294567122144565273">"Suratlarim"</string>
-    <string name="my_photos_generic_wallpaper_title" msgid="7002867526154631172">"Suratim"</string>
-    <string name="fallback_wallpaper_title" msgid="6154655421012506001">"Fon rasmi"</string>
-    <string name="app_not_found" msgid="4431461707854088231">"Bu ilova topilmadi."</string>
-    <string name="center_wallpaper_position" msgid="4166894762352288883">"Markazlash"</string>
-    <string name="center_crop_wallpaper_position" msgid="1681980019815343348">"Markazlab qirqish"</string>
-    <string name="stretch_wallpaper_position" msgid="5002680983147456935">"Yoyish"</string>
-</resources>

diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index fb11d14..9daafea 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Fon rasmlari"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Fon rasmlari"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Fon rasmini tanlang"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Fonga rasm o‘rnatish"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Fonga rasm o‘rnatilmoqda…"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index adc8284..49274df 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Hình nền"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Hình nền"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Chọn hình nền"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Đặt hình nền"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Đang đặt hình nền..."</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2cd843f..18270df 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -17,7 +17,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="5610614769724978966">"壁纸"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"壁纸"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"选择壁纸"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"设置壁纸"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"正在设置壁纸…"</string>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index a2b09fb..19fa6f8 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -17,7 +17,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="5610614769724978966">"桌布"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"桌布"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"選擇桌布"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"設定「桌布」"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"正在設定桌布…"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 678e3ce..47636e5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -17,7 +17,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="5610614769724978966">"桌布"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"桌布"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"選取桌布"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"設定桌布"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"正在設定桌布…"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index dc2e88b..ff0290b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -17,7 +17,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="5610614769724978966">"Izithombe zangemuva"</string>
+    <string name="wallpaper_app_name" msgid="1719889291772891695">"Izithombe zangemuva"</string>
+    <!-- no translation found for app_name (8773648973927541493) -->
+    <skip />
     <string name="select_wallpaper_label" msgid="3026032670158694582">"Khetha isithombe sangemuva"</string>
     <string name="set_wallpaper_button_text" msgid="4426286890442731310">"Setha isithombe sangemuva"</string>
     <string name="set_wallpaper_progress_message" msgid="7986528287618716715">"Isetha isithombe sangemuva..."</string>

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2d01222..9001971 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml

@@ -25,7 +25,8 @@
     <color name="material_black_100">#000000</color>
 
     <color name="material_white_divider">#1fffffff</color>
-
+    <color name="text_color_dark">#2d2d2d</color>
+    <color name="text_color_light">@color/material_white_text</color>
     <color name="primary_color">#2d2d2d</color>
     <color name="secondary_color">#3a3a3a</color>
     <color name="accent_color">@color/material_googblue500</color>

diff --git a/res/values/picker_colors.xml b/res/values/picker_colors.xml
index 7ebac09..f3686de 100755
--- a/res/values/picker_colors.xml
+++ b/res/values/picker_colors.xml

@@ -53,7 +53,7 @@
     <color name="currently_set_both_attribution_title_text_color">@color/material_white_text</color>
     <color name="currently_set_both_attribution_subtitle_text_color">@color/white_70_alpha</color>
 
-    <color name="select_wallpaper_header_text_color">@color/translucent_black_60_alpha</color>
+    <color name="select_wallpaper_header_text_color">@color/white_60_alpha</color>
 
     <color name="rotation_tile_enabled_background_color">@color/accent_color</color>
     <color name="rotation_tile_enabled_title_text_color">@color/material_white_100</color>
@@ -67,7 +67,7 @@
     <color name="individual_tile_title_scrim_color">@color/translucent_black</color>
     <color name="individual_tile_title_text_color">@color/material_white_100</color>
 
-    <color name="individual_picker_background_color">@color/material_grey200</color>
+    <color name="individual_picker_background_color">@color/translucent_black</color>
 
     <color name="preview_pane_arrow_color">@color/material_white_100</color>
 </resources>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index eba6e5c..2c355d1 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -16,7 +16,9 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- The name of this application, a wallpaper picker. [CHAR LIMIT=50] -->
-    <string name="app_name">Wallpapers</string>
+    <string name="wallpaper_app_name">Wallpapers</string>
+
+    <string name="app_name">@string/wallpaper_app_name</string>
 
     <!-- UI Strings -->
     <!-- Label which asks the user to select a wallpaper from the given choices. [CHAR LIMIT=50] -->

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 123b92a..50548c4 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml

@@ -17,7 +17,7 @@
 
     <style name="WallpaperTheme" parent="@style/Theme.AppCompat.NoActionBar">
         <item name="colorControlActivated">?attr/colorPrimary</item>
-        <item name="android:statusBarColor">@color/status_bar_color</item>
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
     </style>
 
     <style name="WallpaperTheme.Preview" parent="@style/Theme.AppCompat.NoActionBar">
@@ -38,19 +38,14 @@
         </item>
     </style>
 
-    <style name="RegularToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/primary_color</item>
-        <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
-    </style>
-
     <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
         <item name="android:background">@color/translucent_black</item>
         <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
     </style>
 
-    <style name="LightDialogTheme" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
-        <item name="android:dialogCornerRadius">8dp</item>
-        <item name="colorAccent">@color/accent_color</item>
+    <style name="LightDialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar">
+        <item name="android:layout">@layout/abc_alert_dialog_material</item>
+        <item name="windowActionBar">false</item>
     </style>
 
     <style name="ProgressDialogThemePreL" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
@@ -79,7 +74,7 @@
     <style name="set_wallpaper_destination_item">
         <item name="android:minHeight">@dimen/set_wallpaper_dialog_item_min_height</item>
         <item name="android:textAppearance">?attr/textAppearanceListItemSmall</item>
-        <item name="android:textColor">?attr/textColorAlertDialogListItem</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">@dimen/abc_text_size_subhead_material</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:alpha">.87</item>
@@ -88,7 +83,7 @@
         <item name="android:background">?attr/selectableItemBackground</item>
         <item name="android:drawablePadding">@dimen/set_wallpaper_dialog_item_drawable_padding
         </item>
-        <item name="android:drawableTint">@color/accent_color</item>
+        <item name="android:drawableTint">?android:colorAccent</item>
         <item name="android:drawableTintMode">src_atop</item>
     </style>
 
@@ -104,4 +99,6 @@
         <item name="android:textSize">@dimen/category_tab_text_size</item>
         <item name="textAllCaps">false</item>
     </style>
+
+    <style name="HeaderTextAppearance" parent="TextAppearance.AppCompat.Widget.ActionBar.Title"/>
 </resources>

diff --git a/src/com/android/wallpaper/asset/Asset.java b/src/com/android/wallpaper/asset/Asset.java
index 5c00f86..c1d2252 100755
--- a/src/com/android/wallpaper/asset/Asset.java
+++ b/src/com/android/wallpaper/asset/Asset.java

@@ -16,6 +16,7 @@
 package com.android.wallpaper.asset;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -26,9 +27,10 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.os.AsyncTask;
-import android.support.annotation.Nullable;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
+
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
 
 /**
@@ -41,12 +43,12 @@
      * filled completely with pixels of the provided placeholder color.
      */
     protected static Drawable getPlaceholderDrawable(
-            Activity activity, ImageView imageView, int placeholderColor) {
+            Context context, ImageView imageView, int placeholderColor) {
         Point imageViewDimensions = getImageViewDimensions(imageView);
         Bitmap placeholderBitmap =
                 Bitmap.createBitmap(imageViewDimensions.x, imageViewDimensions.y, Config.ARGB_8888);
         placeholderBitmap.eraseColor(placeholderColor);
-        return new BitmapDrawable(activity.getResources(), placeholderBitmap);
+        return new BitmapDrawable(context.getResources(), placeholderBitmap);
     }
 
     /**
@@ -127,12 +129,11 @@
     /**
      * Loads a Drawable for this asset into the provided ImageView. While waiting for the image to
      * load, first loads a ColorDrawable based on the provided placeholder color.
-     *
-     * @param activity         Activity hosting the ImageView.
+     *  @param context         Activity hosting the ImageView.
      * @param imageView        ImageView which is the target view of this asset.
      * @param placeholderColor Color of placeholder set to ImageView while waiting for image to load.
      */
-    public void loadDrawable(final Activity activity, final ImageView imageView,
+    public void loadDrawable(final Context context, final ImageView imageView,
                              int placeholderColor) {
         // Transition from a placeholder ColorDrawable to the decoded bitmap when the ImageView in
         // question is empty.
@@ -159,7 +160,7 @@
                     return;
                 }
 
-                Resources resources = activity.getResources();
+                Resources resources = context.getResources();
 
                 Drawable[] layers = new Drawable[2];
                 layers[0] = placeholderDrawable;
@@ -178,19 +179,17 @@
     /**
      * Loads a Drawable for this asset into the provided ImageView, providing a crossfade transition
      * with the given duration from the Drawable previously set on the ImageView.
-     *
-     * @param activity                 Activity hosting the ImageView.
+     * @param context                 Activity hosting the ImageView.
      * @param imageView                ImageView which is the target view of this asset.
      * @param transitionDurationMillis Duration of the crossfade, in milliseconds.
      * @param drawableLoadedListener   Listener called once the transition has begun.
      * @param placeholderColor         Color of the placeholder if the provided ImageView is empty before the
-     *                                 drawable loads.
      */
     public void loadDrawableWithTransition(
-            final Activity activity,
+            final Context context,
             final ImageView imageView,
             final int transitionDurationMillis,
-            final DrawableLoadedListener drawableLoadedListener,
+            @Nullable final DrawableLoadedListener drawableLoadedListener,
             int placeholderColor) {
         Point imageViewDimensions = getImageViewDimensions(imageView);
 
@@ -198,13 +197,13 @@
         // question is empty.
         boolean needsPlaceholder = imageView.getDrawable() == null;
         if (needsPlaceholder) {
-            imageView.setImageDrawable(getPlaceholderDrawable(activity, imageView, placeholderColor));
+            imageView.setImageDrawable(getPlaceholderDrawable(context, imageView, placeholderColor));
         }
 
         decodeBitmap(imageViewDimensions.x, imageViewDimensions.y, new BitmapReceiver() {
             @Override
             public void onBitmapDecoded(Bitmap bitmap) {
-                final Resources resources = activity.getResources();
+                final Resources resources = context.getResources();
 
                 new CenterCropBitmapTask(bitmap, imageView, new BitmapReceiver() {
                     @Override
@@ -231,7 +230,9 @@
                         imageView.setImageDrawable(transitionDrawable);
                         transitionDrawable.startTransition(transitionDurationMillis);
 
-                        drawableLoadedListener.onDrawableLoaded();
+                        if (drawableLoadedListener != null) {
+                            drawableLoadedListener.onDrawableLoaded();
+                        }
                     }
                 }).execute();
             }

diff --git a/src/com/android/wallpaper/asset/BitmapCachingAsset.java b/src/com/android/wallpaper/asset/BitmapCachingAsset.java
new file mode 100644
index 0000000..5bc3703
--- /dev/null
+++ b/src/com/android/wallpaper/asset/BitmapCachingAsset.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2019 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.wallpaper.asset;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.util.LruCache;
+
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityManagerCompat;
+
+import java.util.Objects;
+
+/**
+ * Implementation of {@link Asset} that wraps another {@link Asset} but keeps an LRU cache of
+ * bitmaps generated by {@link #decodeBitmap(int, int, BitmapReceiver)} to avoid having to decode
+ * the same bitmap multiple times.
+ * The cache key is the wrapped Asset and the target Width and Height requested, so that we only
+ * reuse bitmaps of the same size.
+ */
+public class BitmapCachingAsset extends Asset {
+
+    private static class CacheKey {
+        final Asset asset;
+        final int width;
+        final int height;
+
+        CacheKey(Asset asset, int width, int height) {
+            this.asset = asset;
+            this.width = width;
+            this.height = height;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(asset, width, height);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof CacheKey
+                    && ((CacheKey)obj).asset == this.asset
+                    && ((CacheKey)obj).width == this.width
+                    && ((CacheKey)obj).height == this.height;
+        }
+    }
+
+    private static int cacheSize = 100 * 1024 * 1024; // 100MiB
+    private static LruCache<CacheKey, Bitmap> sCache = new LruCache<CacheKey, Bitmap>(cacheSize) {
+        @Override protected int sizeOf(CacheKey key, Bitmap value) {
+            return value.getByteCount();
+        }
+    };
+
+    private final boolean mIsLowRam;
+    private final Asset mOriginalAsset;
+
+    public BitmapCachingAsset(Context context, Asset originalAsset) {
+        mOriginalAsset = originalAsset;
+        mIsLowRam = ActivityManagerCompat.isLowRamDevice(
+                (ActivityManager) context.getApplicationContext().getSystemService(
+                        Context.ACTIVITY_SERVICE));
+    }
+
+    @Override
+    public void decodeBitmap(int targetWidth, int targetHeight, BitmapReceiver receiver) {
+        // Skip the cache in low ram devices
+        if (mIsLowRam) {
+            mOriginalAsset.decodeBitmap(targetWidth, targetHeight, receiver::onBitmapDecoded);
+            return;
+        }
+        CacheKey key = new CacheKey(mOriginalAsset, targetWidth, targetHeight);
+        Bitmap cached = sCache.get(key);
+        if (cached != null) {
+            receiver.onBitmapDecoded(cached);
+        } else {
+            mOriginalAsset.decodeBitmap(targetWidth, targetHeight, bitmap -> {
+                if (bitmap != null) {
+                    sCache.put(key, bitmap);
+                }
+                receiver.onBitmapDecoded(bitmap);
+            });
+        }
+    }
+
+    @Override
+    public void decodeBitmapRegion(Rect rect, int targetWidth, int targetHeight,
+            BitmapReceiver receiver) {
+        mOriginalAsset.decodeBitmapRegion(rect, targetWidth, targetHeight, receiver);
+    }
+
+    @Override
+    public void decodeRawDimensions(@Nullable Activity activity, DimensionsReceiver receiver) {
+        mOriginalAsset.decodeRawDimensions(activity, receiver);
+    }
+
+    @Override
+    public boolean supportsTiling() {
+        return mOriginalAsset.supportsTiling();
+    }
+}

diff --git a/src/com/android/wallpaper/asset/BuiltInWallpaperAsset.java b/src/com/android/wallpaper/asset/BuiltInWallpaperAsset.java
index 16d9a0d..1c73511 100755
--- a/src/com/android/wallpaper/asset/BuiltInWallpaperAsset.java
+++ b/src/com/android/wallpaper/asset/BuiltInWallpaperAsset.java

@@ -108,13 +108,13 @@
     }
 
     @Override
-    public void loadDrawable(Activity activity, ImageView imageView, int placeholderColor) {
+    public void loadDrawable(Context context, ImageView imageView, int placeholderColor) {
         if (mBuiltInWallpaperModel == null) {
             mBuiltInWallpaperModel =
-                    new WallpaperModel(activity.getApplicationContext(), WallpaperModel.SOURCE_BUILT_IN);
+                    new WallpaperModel(context.getApplicationContext(), WallpaperModel.SOURCE_BUILT_IN);
         }
 
-        Glide.with(activity)
+        Glide.with(context)
                 .asDrawable()
                 .load(mBuiltInWallpaperModel)
                 .apply(RequestOptions.centerCropTransform()

diff --git a/src/com/android/wallpaper/asset/ContentUriAsset.java b/src/com/android/wallpaper/asset/ContentUriAsset.java
index d3394a5..ed0a368 100755
--- a/src/com/android/wallpaper/asset/ContentUriAsset.java
+++ b/src/com/android/wallpaper/asset/ContentUriAsset.java

@@ -15,22 +15,26 @@
  */
 package com.android.wallpaper.asset;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.annotation.Nullable;
-import android.support.media.ExifInterface;
 import android.util.Log;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
+
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.Target;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -43,31 +47,40 @@
     private static final String TAG = "ContentUriAsset";
     private static final String JPEG_MIME_TYPE = "image/jpeg";
     private static final String PNG_MIME_TYPE = "image/png";
-    private static final int EXIF_ORIENTATION_NORMAL = 1;
-    private static final int EXIF_ORIENTATION_UNKNOWN = -1;
 
     private final Context mContext;
     private final Uri mUri;
+    private final RequestOptions mRequestOptions;
 
-    private ExifInterface mExifInterface;
+    private ExifInterfaceCompat mExifCompat;
     private int mExifOrientation;
 
     /**
      * @param context The application's context.
      * @param uri     Content URI locating the asset.
+     * @param requestOptions {@link RequestOptions} to be applied when loading the asset.
+     */
+    public ContentUriAsset(Context context, Uri uri, RequestOptions requestOptions) {
+        mExifOrientation = ExifInterfaceCompat.EXIF_ORIENTATION_UNKNOWN;
+        mContext = context.getApplicationContext();
+        mUri = uri;
+        mRequestOptions = requestOptions;
+    }
+
+    /**
+     * @param context The application's context.
+     * @param uri     Content URI locating the asset.
      */
     public ContentUriAsset(Context context, Uri uri) {
-        mExifOrientation = EXIF_ORIENTATION_UNKNOWN;
-        mContext = context.getApplicationContext();
-        mUri = uri;
+        this(context, uri, RequestOptions.centerCropTransform());
     }
 
     @Override
     public void decodeBitmapRegion(final Rect rect, int targetWidth, int targetHeight,
                                    final BitmapReceiver receiver) {
-        // BitmapRegionDecoder only supports images encoded in either JPEG or PNG, so if the content URI
-        // asset is encoded with another format (for example, GIF), then fall back to cropping a bitmap
-        // region from the full-sized bitmap.
+        // BitmapRegionDecoder only supports images encoded in either JPEG or PNG, so if the content
+        // URI asset is encoded with another format (for example, GIF), then fall back to cropping a
+        // bitmap region from the full-sized bitmap.
         if (isJpeg() || isPng()) {
             super.decodeBitmapRegion(rect, targetWidth, targetHeight, receiver);
             return;
@@ -77,8 +90,8 @@
             @Override
             public void onDimensionsDecoded(@Nullable Point dimensions) {
                 if (dimensions == null) {
-                    Log.e(TAG, "There was an error decoding the asset's raw dimensions with content URI: "
-                            + mUri);
+                    Log.e(TAG, "There was an error decoding the asset's raw dimensions with " +
+                            "content URI: " + mUri);
                     receiver.onBitmapDecoded(null);
                     return;
                 }
@@ -87,8 +100,8 @@
                     @Override
                     public void onBitmapDecoded(@Nullable Bitmap fullBitmap) {
                         if (fullBitmap == null) {
-                            Log.e(TAG, "There was an error decoding the asset's full bitmap with content URI: "
-                                    + mUri);
+                            Log.e(TAG, "There was an error decoding the asset's full bitmap with " +
+                                    "content URI: " + mUri);
                             receiver.onBitmapDecoded(null);
                             return;
                         }
@@ -125,28 +138,14 @@
      * empty (i.e., only whitespace).
      */
     public String readExifTag(String tagId) {
-        if (mExifInterface == null) {
-            InputStream inputStream = null;
-            try {
-                inputStream = openInputStream();
-                if (inputStream != null) {
-                    mExifInterface = new ExifInterface(inputStream);
-                }
-            } catch (IOException e) {
-                Log.w(TAG, "Unable to read EXIF tags for content URI asset", e);
-                return null;
-            } finally {
-                if (inputStream != null) {
-                    try {
-                        inputStream.close();
-                    } catch (IOException e) {
-                        Log.e(TAG, "Unable to close InputStream", e);
-                    }
-                }
-            }
+        ensureExifInterface();
+        if (mExifCompat == null) {
+            Log.w(TAG, "Unable to read EXIF tags for content URI asset");
+            return null;
         }
 
-        String attribute = mExifInterface.getAttribute(tagId);
+
+        String attribute = mExifCompat.getAttribute(tagId);
         if (attribute == null || attribute.trim().isEmpty()) {
             return null;
         }
@@ -154,6 +153,19 @@
         return attribute.trim();
     }
 
+    private void ensureExifInterface() {
+        if (mExifCompat == null) {
+            try (InputStream inputStream = openInputStream()) {
+                if (inputStream != null) {
+                    mExifCompat = new ExifInterfaceCompat(inputStream);
+                }
+            } catch (IOException e) {
+                Log.w(TAG, "Couldn't read stream for " + mUri, e);
+            }
+        }
+
+    }
+
     @Override
     protected InputStream openInputStream() {
         try {
@@ -166,7 +178,7 @@
 
     @Override
     protected int getExifOrientation() {
-        if (mExifOrientation != EXIF_ORIENTATION_UNKNOWN) {
+        if (mExifOrientation != ExifInterfaceCompat.EXIF_ORIENTATION_UNKNOWN) {
             return mExifOrientation;
         }
 
@@ -175,49 +187,63 @@
     }
 
     /**
-     * Returns the EXIF rotation for the content URI asset. This method should only be called off the
-     * main UI thread.
+     * Returns the EXIF rotation for the content URI asset. This method should only be called off
+     * the main UI thread.
      */
     private int readExifOrientation() {
-        if (mExifInterface == null) {
-            InputStream inputStream = null;
-            try {
-                inputStream = openInputStream();
-                if (inputStream != null) {
-                    mExifInterface = new ExifInterface(inputStream);
-                }
-            } catch (IOException e) {
-                Log.w(TAG, "Unable to read EXIF rotation for content URI asset with content URI: "
-                        + mUri, e);
-                return EXIF_ORIENTATION_NORMAL;
-            } finally {
-                if (inputStream != null) {
-                    try {
-                        inputStream.close();
-                    } catch (IOException e) {
-                        Log.e(TAG, "Unable to close InputStream", e);
-                    }
-                }
-            }
+        ensureExifInterface();
+        if (mExifCompat == null) {
+            Log.w(TAG, "Unable to read EXIF rotation for content URI asset with content URI: "
+                    + mUri);
+            return ExifInterfaceCompat.EXIF_ORIENTATION_NORMAL;
         }
 
-        int orientationAttribute =
-                mExifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, EXIF_ORIENTATION_NORMAL);
-        return orientationAttribute;
+        return mExifCompat.getAttributeInt(ExifInterfaceCompat.TAG_ORIENTATION,
+                ExifInterfaceCompat.EXIF_ORIENTATION_NORMAL);
     }
 
     @Override
-    public void loadDrawable(Activity activity, ImageView imageView,
+    public void loadDrawable(Context context, ImageView imageView,
                              int placeholderColor) {
-        Glide.with(activity)
+        Glide.with(context)
                 .asDrawable()
                 .load(mUri)
-                .apply(RequestOptions.centerCropTransform()
+                .apply(mRequestOptions
                         .placeholder(new ColorDrawable(placeholderColor)))
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .into(imageView);
     }
 
+    @Override
+    public void loadDrawableWithTransition(Context context, ImageView imageView,
+            int transitionDurationMillis, @Nullable DrawableLoadedListener drawableLoadedListener,
+            int placeholderColor) {
+        Glide.with(context)
+                .asDrawable()
+                .load(mUri)
+                .apply(mRequestOptions
+                        .placeholder(new ColorDrawable(placeholderColor)))
+                .transition(DrawableTransitionOptions.withCrossFade(transitionDurationMillis))
+                .listener(new RequestListener<Drawable>() {
+                    @Override
+                    public boolean onLoadFailed(GlideException e, Object model,
+                            Target<Drawable> target, boolean isFirstResource) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean onResourceReady(Drawable resource, Object model,
+                            Target<Drawable> target, DataSource dataSource,
+                            boolean isFirstResource) {
+                        if (drawableLoadedListener != null) {
+                            drawableLoadedListener.onDrawableLoaded();
+                        }
+                        return false;
+                    }
+                })
+                .into(imageView);
+    }
+
     /**
      * Custom AsyncTask which crops a bitmap region from a larger bitmap.
      */
@@ -240,7 +266,8 @@
             }
 
             return Bitmap.createBitmap(
-                    mFromBitmap, mCropRect.left, mCropRect.top, mCropRect.width(), mCropRect.height());
+                    mFromBitmap, mCropRect.left, mCropRect.top, mCropRect.width(),
+                    mCropRect.height());
         }
 
         @Override

diff --git a/src/com/android/wallpaper/asset/CurrentWallpaperAssetVN.java b/src/com/android/wallpaper/asset/CurrentWallpaperAssetVN.java
index a4714e6..70c729e 100755
--- a/src/com/android/wallpaper/asset/CurrentWallpaperAssetVN.java
+++ b/src/com/android/wallpaper/asset/CurrentWallpaperAssetVN.java

@@ -15,7 +15,6 @@
  */
 package com.android.wallpaper.asset;
 
-import android.app.Activity;
 import android.app.WallpaperManager;
 import android.content.Context;
 import android.os.ParcelFileDescriptor;
@@ -86,9 +85,9 @@
     }
 
     @Override
-    public void loadDrawable(Activity activity, ImageView imageView,
+    public void loadDrawable(Context context, ImageView imageView,
                              int unusedPlaceholderColor) {
-        Glide.with(activity)
+        Glide.with(context)
                 .asDrawable()
                 .load(CurrentWallpaperAssetVN.this)
                 .apply(RequestOptions.centerCropTransform())

diff --git a/src/com/android/wallpaper/asset/CurrentWallpaperAssetVNLoader.java b/src/com/android/wallpaper/asset/CurrentWallpaperAssetVNLoader.java
index d3d768f..b8a7686 100755
--- a/src/com/android/wallpaper/asset/CurrentWallpaperAssetVNLoader.java
+++ b/src/com/android/wallpaper/asset/CurrentWallpaperAssetVNLoader.java

@@ -17,7 +17,6 @@
 
 import android.os.ParcelFileDescriptor;
 import android.os.ParcelFileDescriptor.AutoCloseInputStream;
-import android.support.annotation.Nullable;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
@@ -29,6 +28,8 @@
 
 import java.io.InputStream;
 
+import androidx.annotation.Nullable;
+
 /**
  * Glide custom model loader for {@link CurrentWallpaperAssetVN}.
  */

diff --git a/src/com/android/wallpaper/asset/DrawableResourceDecoder.java b/src/com/android/wallpaper/asset/DrawableResourceDecoder.java
index cbf8737..b7ca43e 100755
--- a/src/com/android/wallpaper/asset/DrawableResourceDecoder.java
+++ b/src/com/android/wallpaper/asset/DrawableResourceDecoder.java

@@ -16,7 +16,6 @@
 package com.android.wallpaper.asset;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
 
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.ResourceDecoder;
@@ -25,6 +24,8 @@
 
 import java.io.IOException;
 
+import androidx.annotation.Nullable;
+
 /**
  * Identity {@link ResourceDecoder} implementation that simply passes through a Drawable.
  * <p>

diff --git a/src/com/android/wallpaper/asset/ExifInterfaceCompat.java b/src/com/android/wallpaper/asset/ExifInterfaceCompat.java
new file mode 100644
index 0000000..6b2938e
--- /dev/null
+++ b/src/com/android/wallpaper/asset/ExifInterfaceCompat.java

@@ -0,0 +1,50 @@
+package com.android.wallpaper.asset;
+
+import com.android.wallpaper.compat.BuildCompat;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import androidx.exifinterface.media.ExifInterface;
+
+/**
+ * Provides access to basic ExifInterface APIs using {@link android.media.ExifInterface} in OMR1+
+ * SDK or SupportLibrary's {@link ExifInterface} for earlier SDK versions.
+ */
+class ExifInterfaceCompat {
+
+    public static final String TAG_ORIENTATION = ExifInterface.TAG_ORIENTATION;
+    public static final int EXIF_ORIENTATION_NORMAL = 1;
+    public static final int EXIF_ORIENTATION_UNKNOWN = -1;
+
+    private ExifInterface mSupportExifInterface;
+    private android.media.ExifInterface mFrameworkExifInterface;
+
+    /**
+     * Reads Exif tags from the specified image input stream. It's the caller's responsibility to
+     * close the given InputStream after use.
+     * @see ExifInterface#ExifInterface(InputStream)
+     * @see android.media.ExifInterface#ExifInterface(InputStream)
+     */
+    public ExifInterfaceCompat(InputStream inputStream) throws IOException {
+        // O-MR1 added support for more formats (HEIF), which Support Library cannot implement,
+        // so use the framework version for SDK 27+
+        if (BuildCompat.isAtLeastOMR1()) {
+            mFrameworkExifInterface = new android.media.ExifInterface(inputStream);
+        } else {
+            mSupportExifInterface = new ExifInterface(inputStream);
+        }
+    }
+
+    public int getAttributeInt(String tag, int defaultValue) {
+        return mFrameworkExifInterface != null
+                ? mFrameworkExifInterface.getAttributeInt(tag, defaultValue)
+                : mSupportExifInterface.getAttributeInt(tag, defaultValue);
+    }
+
+    public String getAttribute(String tag) {
+        return mFrameworkExifInterface != null
+                ? mFrameworkExifInterface.getAttribute(tag)
+                : mSupportExifInterface.getAttribute(tag);
+    }
+}

diff --git a/src/com/android/wallpaper/asset/LiveWallpaperThumbAsset.java b/src/com/android/wallpaper/asset/LiveWallpaperThumbAsset.java
index 1f7a624..0214030 100755
--- a/src/com/android/wallpaper/asset/LiveWallpaperThumbAsset.java
+++ b/src/com/android/wallpaper/asset/LiveWallpaperThumbAsset.java

@@ -69,9 +69,9 @@
     }
 
     @Override
-    public void loadDrawable(Activity activity, ImageView imageView,
+    public void loadDrawable(Context context, ImageView imageView,
                              int placeholderColor) {
-        Glide.with(activity)
+        Glide.with(context)
                 .asDrawable()
                 .load(LiveWallpaperThumbAsset.this)
                 .apply(RequestOptions.centerCropTransform()

diff --git a/src/com/android/wallpaper/asset/LiveWallpaperThumbAssetLoader.java b/src/com/android/wallpaper/asset/LiveWallpaperThumbAssetLoader.java
index 9011ee6..1c6b2c6 100755
--- a/src/com/android/wallpaper/asset/LiveWallpaperThumbAssetLoader.java
+++ b/src/com/android/wallpaper/asset/LiveWallpaperThumbAssetLoader.java

@@ -16,7 +16,6 @@
 package com.android.wallpaper.asset;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
@@ -26,6 +25,8 @@
 import com.bumptech.glide.load.model.ModelLoaderFactory;
 import com.bumptech.glide.load.model.MultiModelLoaderFactory;
 
+import androidx.annotation.Nullable;
+
 /**
  * Glide model loader for live wallpaper thumbnails.
  */

diff --git a/src/com/android/wallpaper/asset/NexusStaticAssetLoader.java b/src/com/android/wallpaper/asset/NexusStaticAssetLoader.java
index 00bb1ee..f75154b 100755
--- a/src/com/android/wallpaper/asset/NexusStaticAssetLoader.java
+++ b/src/com/android/wallpaper/asset/NexusStaticAssetLoader.java

@@ -15,9 +15,8 @@
  */
 package com.android.wallpaper.asset;
 
-import android.support.annotation.Nullable;
-
 import com.android.wallpaper.asset.ResourceAssetLoader.ResourceAssetFetcher;
+
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
@@ -25,6 +24,8 @@
 
 import java.io.InputStream;
 
+import androidx.annotation.Nullable;
+
 /**
  * Glide ModelLoader which loads InputStreams from NexusStaticAssets.
  */

diff --git a/src/com/android/wallpaper/asset/ResourceAsset.java b/src/com/android/wallpaper/asset/ResourceAsset.java
index aeccc33..6284215 100755
--- a/src/com/android/wallpaper/asset/ResourceAsset.java
+++ b/src/com/android/wallpaper/asset/ResourceAsset.java

@@ -15,7 +15,7 @@
  */
 package com.android.wallpaper.asset;
 
-import android.app.Activity;
+import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.ColorDrawable;
 import android.widget.ImageView;
@@ -34,25 +34,36 @@
 public class ResourceAsset extends StreamableAsset {
     protected final Resources mRes;
     protected final int mResId;
+    private final RequestOptions mRequestOptions;
 
     protected Key mKey;
 
     /**
      * @param res   Resources containing the asset.
      * @param resId Resource ID referencing the asset.
+     * @param requestOptions {@link RequestOptions} to be applied when loading the asset.
      */
-    public ResourceAsset(Resources res, int resId) {
+    public ResourceAsset(Resources res, int resId, RequestOptions requestOptions) {
         mRes = res;
         mResId = resId;
+        mRequestOptions = requestOptions;
+    }
+
+    /**
+     * @param res   Resources containing the asset.
+     * @param resId Resource ID referencing the asset.
+     */
+    public ResourceAsset(Resources res, int resId) {
+        this(res, resId, RequestOptions.centerCropTransform());
     }
 
     @Override
-    public void loadDrawable(Activity activity, ImageView imageView,
+    public void loadDrawable(Context context, ImageView imageView,
                              int placeholderColor) {
-        Glide.with(activity)
+        Glide.with(context)
                 .asDrawable()
                 .load(ResourceAsset.this)
-                .apply(RequestOptions.centerCropTransform()
+                .apply(mRequestOptions
                         .placeholder(new ColorDrawable(placeholderColor)))
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .into(imageView);

diff --git a/src/com/android/wallpaper/asset/ResourceAssetLoader.java b/src/com/android/wallpaper/asset/ResourceAssetLoader.java
index 1cd20b8..6de89ba 100755
--- a/src/com/android/wallpaper/asset/ResourceAssetLoader.java
+++ b/src/com/android/wallpaper/asset/ResourceAssetLoader.java

@@ -15,8 +15,6 @@
  */
 package com.android.wallpaper.asset;
 
-import android.support.annotation.Nullable;
-
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.Options;
@@ -27,6 +25,8 @@
 
 import java.io.InputStream;
 
+import androidx.annotation.Nullable;
+
 /**
  * Glide ModelLoader which loads InputStreams from ResourceAssets.
  */

diff --git a/src/com/android/wallpaper/asset/StreamableAsset.java b/src/com/android/wallpaper/asset/StreamableAsset.java
index e8e2c48..d5b27b5 100755
--- a/src/com/android/wallpaper/asset/StreamableAsset.java
+++ b/src/com/android/wallpaper/asset/StreamableAsset.java

@@ -24,12 +24,13 @@
 import android.graphics.Rect;
 import android.media.ExifInterface;
 import android.os.AsyncTask;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import java.io.IOException;
 import java.io.InputStream;
 
+import androidx.annotation.Nullable;
+
 /**
  * Represents Asset types for which bytes can be read directly, allowing for flexible bitmap
  * decoding.

diff --git a/src/com/android/wallpaper/asset/WallpaperModel.java b/src/com/android/wallpaper/asset/WallpaperModel.java
index e6b5f38..a5201f8 100755
--- a/src/com/android/wallpaper/asset/WallpaperModel.java
+++ b/src/com/android/wallpaper/asset/WallpaperModel.java

@@ -20,12 +20,13 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.IntDef;
 import android.util.Log;
 
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.signature.ObjectKey;
 
+import androidx.annotation.IntDef;
+
 /**
  * Glide model representing wallpaper image data retrieved from {@link WallpaperManager}.
  * <p>

diff --git a/src/com/android/wallpaper/asset/WallpaperModelLoader.java b/src/com/android/wallpaper/asset/WallpaperModelLoader.java
index 7fe8a63..77b3480 100755
--- a/src/com/android/wallpaper/asset/WallpaperModelLoader.java
+++ b/src/com/android/wallpaper/asset/WallpaperModelLoader.java

@@ -16,7 +16,6 @@
 package com.android.wallpaper.asset;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
@@ -26,6 +25,8 @@
 import com.bumptech.glide.load.model.ModelLoaderFactory;
 import com.bumptech.glide.load.model.MultiModelLoaderFactory;
 
+import androidx.annotation.Nullable;
+
 /**
  * Custom Glide {@link ModelLoader} which can load {@link Drawable} objects from
  * {@link WallpaperModel} objects.

diff --git a/src/com/android/wallpaper/backup/MissingHashCodeGeneratorJobService.java b/src/com/android/wallpaper/backup/MissingHashCodeGeneratorJobService.java
index 07cddea..558e518 100755
--- a/src/com/android/wallpaper/backup/MissingHashCodeGeneratorJobService.java
+++ b/src/com/android/wallpaper/backup/MissingHashCodeGeneratorJobService.java

@@ -28,8 +28,6 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
 import com.android.wallpaper.asset.BitmapUtils;
@@ -44,6 +42,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 /**
  * {@link android.app.job.JobScheduler} job for generating missing hash codes for static wallpapers
  * on N+ devices.

diff --git a/src/com/android/wallpaper/compat/BuildCompat.java b/src/com/android/wallpaper/compat/BuildCompat.java
index f4d4b59..325b992 100755
--- a/src/com/android/wallpaper/compat/BuildCompat.java
+++ b/src/com/android/wallpaper/compat/BuildCompat.java

@@ -81,6 +81,13 @@
     }
 
     /**
+     * Returns whether the framework on the current Android device is O-MR1 or higher.
+     */
+    public static boolean isAtLeastOMR1() {
+        return sSdk >= VERSION_CODES.O_MR1;
+    }
+
+    /**
      * Sets the SDK version that BuildCompat will consider the current device to be on. Used for
      * testing only.
      */

diff --git a/src/com/android/wallpaper/compat/WallpaperManagerCompat.java b/src/com/android/wallpaper/compat/WallpaperManagerCompat.java
index 5a120cc..ef834a1 100755
--- a/src/com/android/wallpaper/compat/WallpaperManagerCompat.java
+++ b/src/com/android/wallpaper/compat/WallpaperManagerCompat.java

@@ -21,11 +21,12 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.IntDef;
 
 import java.io.IOException;
 import java.io.InputStream;
 
+import androidx.annotation.IntDef;
+
 /**
  * An abstraction over WallpaperManager to allow for the transitional state in which the N SDK
  * is not yet ready but we need to use new N API methods. Provides wrapper methods for the new

diff --git a/src/com/android/wallpaper/model/CategoryProvider.java b/src/com/android/wallpaper/model/CategoryProvider.java
index 7f52c48..3977d89 100755
--- a/src/com/android/wallpaper/model/CategoryProvider.java
+++ b/src/com/android/wallpaper/model/CategoryProvider.java

@@ -15,7 +15,7 @@
  */
 package com.android.wallpaper.model;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Fetches and provides wallpaper categories to any registered {@link CategoryReceiver}s.

diff --git a/src/com/android/wallpaper/model/CurrentWallpaperInfoV16.java b/src/com/android/wallpaper/model/CurrentWallpaperInfoV16.java
index e5efee6..3db46e7 100755
--- a/src/com/android/wallpaper/model/CurrentWallpaperInfoV16.java
+++ b/src/com/android/wallpaper/model/CurrentWallpaperInfoV16.java

@@ -18,8 +18,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Parcel;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
 
 import com.android.wallpaper.asset.Asset;
 import com.android.wallpaper.asset.CurrentWallpaperAssetV16;
@@ -31,6 +29,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+
 /**
  * Represents the wallpaper currently set to the device for API 16 through 23. Should not be used
  * to set a new wallpaper.

diff --git a/src/com/android/wallpaper/model/CurrentWallpaperInfoVN.java b/src/com/android/wallpaper/model/CurrentWallpaperInfoVN.java
index 8d1aa03..eafbec9 100755
--- a/src/com/android/wallpaper/model/CurrentWallpaperInfoVN.java
+++ b/src/com/android/wallpaper/model/CurrentWallpaperInfoVN.java

@@ -19,8 +19,6 @@
 import android.content.Context;
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
 import android.util.Log;
 
 import com.android.wallpaper.asset.Asset;
@@ -37,6 +35,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+
 /**
  * Represents the currently set wallpaper on N+ devices. Should not be used to set a new wallpaper.
  */

diff --git a/src/com/android/wallpaper/model/DefaultWallpaperInfo.java b/src/com/android/wallpaper/model/DefaultWallpaperInfo.java
index c448a2d..78f1575 100755
--- a/src/com/android/wallpaper/model/DefaultWallpaperInfo.java
+++ b/src/com/android/wallpaper/model/DefaultWallpaperInfo.java

@@ -37,7 +37,7 @@
             new Creator<DefaultWallpaperInfo>() {
                 @Override
                 public DefaultWallpaperInfo createFromParcel(Parcel in) {
-                    return new DefaultWallpaperInfo(in);
+                    return new DefaultWallpaperInfo();
                 }
 
                 @Override
@@ -47,12 +47,6 @@
             };
     private Asset mAsset;
 
-    public DefaultWallpaperInfo() {
-    }
-
-    private DefaultWallpaperInfo(Parcel in) {
-    }
-
     @Override
     public List<String> getAttributions(Context context) {
         return Arrays.asList(context.getResources().getString(R.string.fallback_wallpaper_title));

diff --git a/src/com/android/wallpaper/model/ImageWallpaperInfo.java b/src/com/android/wallpaper/model/ImageWallpaperInfo.java
index 3195228..fcc1276 100755
--- a/src/com/android/wallpaper/model/ImageWallpaperInfo.java
+++ b/src/com/android/wallpaper/model/ImageWallpaperInfo.java

@@ -20,7 +20,6 @@
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.media.ExifInterface;
 import android.util.Log;
 
 import com.android.wallpaper.R;
@@ -34,6 +33,8 @@
 import java.util.Date;
 import java.util.List;
 
+import androidx.exifinterface.media.ExifInterface;
+
 /**
  * Represents a wallpaper image from the system's image picker.
  */

diff --git a/src/com/android/wallpaper/model/LiveWallpaperCategory.java b/src/com/android/wallpaper/model/LiveWallpaperCategory.java
index 93b88fa..253e11d 100644
--- a/src/com/android/wallpaper/model/LiveWallpaperCategory.java
+++ b/src/com/android/wallpaper/model/LiveWallpaperCategory.java

@@ -17,11 +17,12 @@
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.Nullable;
+
 
 public class LiveWallpaperCategory extends WallpaperCategory {
 

diff --git a/src/com/android/wallpaper/model/LiveWallpaperInfo.java b/src/com/android/wallpaper/model/LiveWallpaperInfo.java
index fd3f151..5fc3cea 100755
--- a/src/com/android/wallpaper/model/LiveWallpaperInfo.java
+++ b/src/com/android/wallpaper/model/LiveWallpaperInfo.java

@@ -26,7 +26,6 @@
 import android.net.Uri;
 import android.os.Parcel;
 import android.service.wallpaper.WallpaperService;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.android.wallpaper.R;
@@ -46,6 +45,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import androidx.annotation.Nullable;
+
 /**
  * Represents a live wallpaper from the system.
  */
@@ -86,7 +87,7 @@
         mVisibleTitle = visibleTitle;
     }
 
-    private LiveWallpaperInfo(Parcel in) {
+    LiveWallpaperInfo(Parcel in) {
         mInfo = in.readParcelable(android.app.WallpaperInfo.class.getClassLoader());
         mVisibleTitle = in.readInt() == 1;
     }
@@ -239,7 +240,7 @@
         return wallpaperInfos;
     }
 
-    private static boolean isSystemApp(ApplicationInfo appInfo) {
+    static boolean isSystemApp(ApplicationInfo appInfo) {
         return (appInfo.flags & (ApplicationInfo.FLAG_SYSTEM
                 | ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) != 0;
     }

diff --git a/src/com/android/wallpaper/model/WallpaperInfo.java b/src/com/android/wallpaper/model/WallpaperInfo.java
index 28ccdc1..9f657af 100755
--- a/src/com/android/wallpaper/model/WallpaperInfo.java
+++ b/src/com/android/wallpaper/model/WallpaperInfo.java

@@ -20,9 +20,10 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Parcelable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.StringRes;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.StringRes;
 
 import com.android.wallpaper.R;
 import com.android.wallpaper.asset.Asset;
@@ -57,8 +58,9 @@
     }
 
     /**
-     * @param context
-     * @return The available attributions for this wallpaper, as a list of strings.
+     * @return The available attributions for this wallpaper, as a list of strings. These represent
+     * the author / website or any other attribution required to be displayed for this wallpaper
+     * regarding authorship, ownership, etc.
      */
     public abstract List<String> getAttributions(Context context);
 

diff --git a/src/com/android/wallpaper/model/WallpaperMetadata.java b/src/com/android/wallpaper/model/WallpaperMetadata.java
index 289275a..22c1044 100755
--- a/src/com/android/wallpaper/model/WallpaperMetadata.java
+++ b/src/com/android/wallpaper/model/WallpaperMetadata.java

@@ -16,11 +16,12 @@
 package com.android.wallpaper.model;
 
 import android.app.WallpaperInfo;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
 
 import java.util.List;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+
 /**
  * Lightweight wrapper for user-facing wallpaper metadata.
  */

diff --git a/src/com/android/wallpaper/model/WallpaperRotationInitializer.java b/src/com/android/wallpaper/model/WallpaperRotationInitializer.java
index b198a05..ad9eef9 100755
--- a/src/com/android/wallpaper/model/WallpaperRotationInitializer.java
+++ b/src/com/android/wallpaper/model/WallpaperRotationInitializer.java

@@ -17,7 +17,8 @@
 
 import android.content.Context;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
+
+import androidx.annotation.IntDef;
 
 /**
  * Interface for objects which initialize daily wallpaper rotations.

diff --git a/src/com/android/wallpaper/module/BaseWallpaperInjector.java b/src/com/android/wallpaper/module/BaseWallpaperInjector.java
index 0f60f7f..0904227 100755
--- a/src/com/android/wallpaper/module/BaseWallpaperInjector.java
+++ b/src/com/android/wallpaper/module/BaseWallpaperInjector.java

@@ -20,6 +20,7 @@
 import com.android.wallpaper.compat.WallpaperManagerCompat;
 import com.android.wallpaper.network.Requester;
 import com.android.wallpaper.network.WallpaperRequester;
+import com.android.wallpaper.picker.individual.IndividualPickerFragment;
 
 /**
  * Base implementation of Injector.
@@ -41,6 +42,7 @@
     private RotatingWallpaperComponentChecker mRotatingWallpaperComponentChecker;
     private FormFactorChecker mFormFactorChecker;
     private PackageStatusNotifier mPackageStatusNotifier;
+    private IndividualPickerFragment mIndividualPickerFragment;
 
     @Override
     public synchronized BitmapCropper getBitmapCropper() {
@@ -172,4 +174,11 @@
         }
         return mFormFactorChecker;
     }
+
+    @Override
+    public synchronized IndividualPickerFragment getIndividualPickerFragment(String collectionId) {
+        mIndividualPickerFragment = IndividualPickerFragment.newInstance(collectionId);
+
+        return mIndividualPickerFragment;
+    }
 }

diff --git a/src/com/android/wallpaper/module/BitmapCropper.java b/src/com/android/wallpaper/module/BitmapCropper.java
index e23cfdc..ca38d2e 100755
--- a/src/com/android/wallpaper/module/BitmapCropper.java
+++ b/src/com/android/wallpaper/module/BitmapCropper.java

@@ -17,10 +17,11 @@
 
 import android.graphics.Bitmap;
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
 
 import com.android.wallpaper.asset.Asset;
 
+import androidx.annotation.Nullable;
+
 /**
  * Interface for classes which perform crop operations on bitmaps.
  */

diff --git a/src/com/android/wallpaper/module/CurrentWallpaperInfoFactory.java b/src/com/android/wallpaper/module/CurrentWallpaperInfoFactory.java
index 6aeea8c..ed8f83f 100755
--- a/src/com/android/wallpaper/module/CurrentWallpaperInfoFactory.java
+++ b/src/com/android/wallpaper/module/CurrentWallpaperInfoFactory.java

@@ -15,11 +15,11 @@
  */
 package com.android.wallpaper.module;
 
-import android.support.annotation.Nullable;
-
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.module.WallpaperPreferences.PresentationMode;
 
+import androidx.annotation.Nullable;
+
 /**
  * Interface for factories which construct {@link WallpaperInfo} objects representing the device's
  * currently set wallpapers.

diff --git a/src/com/android/wallpaper/module/DailyLoggingAlarmReceiver.java b/src/com/android/wallpaper/module/DailyLoggingAlarmReceiver.java
index 0c5aa55..ba925b4 100755
--- a/src/com/android/wallpaper/module/DailyLoggingAlarmReceiver.java
+++ b/src/com/android/wallpaper/module/DailyLoggingAlarmReceiver.java

@@ -20,7 +20,6 @@
 import android.content.Intent;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.android.wallpaper.model.WallpaperMetadata;
@@ -30,6 +29,8 @@
 
 import java.util.Calendar;
 
+import androidx.annotation.Nullable;
+
 /**
  * Performs daily logging operations when alarm is received.
  */
@@ -57,7 +58,6 @@
         logger.logNumDailyWallpaperRotationsInLastWeek();
         logger.logNumDailyWallpaperRotationsPreviousDay();
         logger.logWallpaperPresentationMode();
-        logDailyActive(appContext);
 
         preferences.setLastDailyLogTimestamp(System.currentTimeMillis());
 
@@ -67,42 +67,6 @@
         DiskBasedLogger.clearOldLogs(appContext);
     }
 
-    private void logDailyActive(Context appContext) {
-        Injector injector = InjectorProvider.getInjector();
-        UserEventLogger logger = injector.getUserEventLogger(appContext);
-        WallpaperPreferences preferences = injector.getPreferences(appContext);
-
-        long lastAppLaunchTimestamp = preferences.getLastAppActiveTimestamp();
-
-        Calendar calendar = Calendar.getInstance();
-        // Subtract 28 days first to get a date 28 days ago to assess 28 day active, then add back
-        // enough days to calculate 14 day active, 7 day active, and 1 day active.
-        calendar.add(Calendar.DAY_OF_YEAR, -28);
-        long twentyEightDaysAgo = calendar.getTimeInMillis();
-
-        calendar.add(Calendar.DAY_OF_YEAR, 14);
-        long fourteenDaysAgo = calendar.getTimeInMillis();
-
-        calendar.add(Calendar.DAY_OF_YEAR, 7);
-        long sevenDaysAgo = calendar.getTimeInMillis();
-
-        calendar.add(Calendar.DAY_OF_YEAR, 6);
-        long oneDayAgo = calendar.getTimeInMillis();
-
-        if (lastAppLaunchTimestamp >= oneDayAgo) {
-            logger.log1DayActive();
-        }
-        if (lastAppLaunchTimestamp >= sevenDaysAgo) {
-            logger.log7DayActive();
-        }
-        if (lastAppLaunchTimestamp >= fourteenDaysAgo) {
-            logger.log14DayActive();
-        }
-        if (lastAppLaunchTimestamp >= twentyEightDaysAgo) {
-            logger.log28DayActive();
-        }
-    }
-
     /**
      * If daily wallpapers are currently in effect and were enabled more than 24 hours ago, then log
      * the last-known rotation status as reported by the periodic background rotation components

diff --git a/src/com/android/wallpaper/module/DefaultCurrentWallpaperInfoFactory.java b/src/com/android/wallpaper/module/DefaultCurrentWallpaperInfoFactory.java
index 165db39..f4fb4ea 100755
--- a/src/com/android/wallpaper/module/DefaultCurrentWallpaperInfoFactory.java
+++ b/src/com/android/wallpaper/module/DefaultCurrentWallpaperInfoFactory.java

@@ -16,7 +16,6 @@
 package com.android.wallpaper.module;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
 
 import com.android.wallpaper.compat.BuildCompat;
 import com.android.wallpaper.compat.WallpaperManagerCompat;
@@ -28,6 +27,8 @@
 import com.android.wallpaper.module.WallpaperPreferences.PresentationMode;
 import com.android.wallpaper.module.WallpaperRefresher.RefreshListener;
 
+import androidx.annotation.Nullable;
+
 /**
  * Default implementation of {@link CurrentWallpaperInfoFactory} which actually constructs
  * {@link WallpaperInfo} instances representing the wallpapers currently set to the device.

diff --git a/src/com/android/wallpaper/module/DefaultExploreIntentChecker.java b/src/com/android/wallpaper/module/DefaultExploreIntentChecker.java
index 5c8ad18..e3ced71 100755
--- a/src/com/android/wallpaper/module/DefaultExploreIntentChecker.java
+++ b/src/com/android/wallpaper/module/DefaultExploreIntentChecker.java

@@ -21,12 +21,13 @@
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.Nullable;
+
 /**
  * Checks whether an explore action can be taken for the given uri, i.e. whether any activity on
  * the device is capable of handling it.

diff --git a/src/com/android/wallpaper/module/DefaultWallpaperPersister.java b/src/com/android/wallpaper/module/DefaultWallpaperPersister.java
index be08a39..e2c968c 100755
--- a/src/com/android/wallpaper/module/DefaultWallpaperPersister.java
+++ b/src/com/android/wallpaper/module/DefaultWallpaperPersister.java

@@ -28,7 +28,6 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.os.AsyncTask;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;
@@ -59,6 +58,8 @@
 import java.io.InputStream;
 import java.util.List;
 
+import androidx.annotation.Nullable;
+
 /**
  * Concrete implementation of WallpaperPersister which actually sets wallpapers to the system via
  * the WallpaperManager.

diff --git a/src/com/android/wallpaper/module/DefaultWallpaperPreferences.java b/src/com/android/wallpaper/module/DefaultWallpaperPreferences.java
index 9c84978..bd017ac 100755
--- a/src/com/android/wallpaper/module/DefaultWallpaperPreferences.java
+++ b/src/com/android/wallpaper/module/DefaultWallpaperPreferences.java

@@ -19,9 +19,10 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 
@@ -39,8 +40,8 @@
 
     private static final String TAG = "DefaultWPPreferences";
 
-    private SharedPreferences mSharedPrefs;
-    private Context mContext;
+    protected SharedPreferences mSharedPrefs;
+    protected Context mContext;
 
     // Keep a strong reference to this OnSharedPreferenceChangeListener to prevent the listener from
     // being garbage collected because SharedPreferences only holds a weak reference.

diff --git a/src/com/android/wallpaper/module/ExploreIntentChecker.java b/src/com/android/wallpaper/module/ExploreIntentChecker.java
index e7518b4..90c072a 100755
--- a/src/com/android/wallpaper/module/ExploreIntentChecker.java
+++ b/src/com/android/wallpaper/module/ExploreIntentChecker.java

@@ -17,7 +17,8 @@
 
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
 
 /**
  * Interface for an object which checks whether any activity on the device can handle ACTION_VIEW

diff --git a/src/com/android/wallpaper/module/FormFactorChecker.java b/src/com/android/wallpaper/module/FormFactorChecker.java
index 7f424c4..0fbf9eb 100755
--- a/src/com/android/wallpaper/module/FormFactorChecker.java
+++ b/src/com/android/wallpaper/module/FormFactorChecker.java

@@ -15,7 +15,7 @@
  */
 package com.android.wallpaper.module;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 /**
  * Checks the form factor of the device.

diff --git a/src/com/android/wallpaper/module/Injector.java b/src/com/android/wallpaper/module/Injector.java
index 6e2f9b4..520e79b 100755
--- a/src/com/android/wallpaper/module/Injector.java
+++ b/src/com/android/wallpaper/module/Injector.java

@@ -17,13 +17,15 @@
 
 import android.content.Context;
 
-import android.support.v4.app.Fragment;
 import com.android.wallpaper.compat.WallpaperManagerCompat;
 import com.android.wallpaper.model.CategoryProvider;
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.monitor.PerformanceMonitor;
 import com.android.wallpaper.network.Requester;
 import com.android.wallpaper.picker.PreviewFragment.PreviewMode;
+import com.android.wallpaper.picker.individual.IndividualPickerFragment;
+
+import androidx.fragment.app.Fragment;
 
 /**
  * Interface for a provider of "injected dependencies." (NOTE: The term "injector" is somewhat of a
@@ -76,4 +78,6 @@
         boolean testingModeEnabled);
 
     PackageStatusNotifier getPackageStatusNotifier(Context context);
+
+    IndividualPickerFragment getIndividualPickerFragment(String collectionId);
 }

diff --git a/src/com/android/wallpaper/module/NetworkStatusNotifier.java b/src/com/android/wallpaper/module/NetworkStatusNotifier.java
index 31f72e2..50e52e4 100755
--- a/src/com/android/wallpaper/module/NetworkStatusNotifier.java
+++ b/src/com/android/wallpaper/module/NetworkStatusNotifier.java

@@ -15,7 +15,7 @@
  */
 package com.android.wallpaper.module;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 /**
  * Provides current status of the network. Abstraction layer above Android's ConnectivityManager

diff --git a/src/com/android/wallpaper/module/NoBackupImageWallpaper.java b/src/com/android/wallpaper/module/NoBackupImageWallpaper.java
index a132207..a76d881 100755
--- a/src/com/android/wallpaper/module/NoBackupImageWallpaper.java
+++ b/src/com/android/wallpaper/module/NoBackupImageWallpaper.java

@@ -15,6 +15,9 @@
  */
 package com.android.wallpaper.module;
 
+import static javax.microedition.khronos.egl.EGL10.EGL_NO_CONTEXT;
+import static javax.microedition.khronos.egl.EGL10.EGL_NO_SURFACE;
+
 import android.annotation.SuppressLint;
 import android.app.WallpaperColors;
 import android.app.WallpaperManager;
@@ -39,7 +42,6 @@
 import android.os.Handler;
 import android.renderscript.Matrix4f;
 import android.service.wallpaper.WallpaperService;
-import android.support.annotation.RequiresApi;
 import android.util.Log;
 import android.view.Display;
 import android.view.MotionEvent;
@@ -63,8 +65,7 @@
 import javax.microedition.khronos.egl.EGLDisplay;
 import javax.microedition.khronos.egl.EGLSurface;
 
-import static javax.microedition.khronos.egl.EGL10.EGL_NO_CONTEXT;
-import static javax.microedition.khronos.egl.EGL10.EGL_NO_SURFACE;
+import androidx.annotation.RequiresApi;
 
 /**
  * Live wallpaper service which simply renders a wallpaper from internal storage. Designed as a

diff --git a/src/com/android/wallpaper/module/NoOpUserEventLogger.java b/src/com/android/wallpaper/module/NoOpUserEventLogger.java
index ce97d44..1d780fe 100755
--- a/src/com/android/wallpaper/module/NoOpUserEventLogger.java
+++ b/src/com/android/wallpaper/module/NoOpUserEventLogger.java

@@ -23,6 +23,16 @@
 public class NoOpUserEventLogger implements UserEventLogger {
 
     @Override
+    public void logResumed() {
+
+    }
+
+    @Override
+    public void logStopped() {
+
+    }
+
+    @Override
     public void logAppLaunched() {
     }
 
@@ -71,22 +81,6 @@
     }
 
     @Override
-    public void log1DayActive() {
-    }
-
-    @Override
-    public void log7DayActive() {
-    }
-
-    @Override
-    public void log14DayActive() {
-    }
-
-    @Override
-    public void log28DayActive() {
-    }
-
-    @Override
     public void logDailyWallpaperDecodes(boolean decodes) {
     }
 
@@ -139,8 +133,4 @@
     @Override
     public void logRestored() {
     }
-
-    @Override
-    public void logWallpaperPosition(@WallpaperPosition int wallpaperPosition) {
-    }
 }

diff --git a/src/com/android/wallpaper/module/PackageStatusNotifier.java b/src/com/android/wallpaper/module/PackageStatusNotifier.java
index c315818..2e90d86 100644
--- a/src/com/android/wallpaper/module/PackageStatusNotifier.java
+++ b/src/com/android/wallpaper/module/PackageStatusNotifier.java

@@ -15,7 +15,7 @@
  */
 package com.android.wallpaper.module;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 
 /**

diff --git a/src/com/android/wallpaper/module/RotatingWallpaperComponentChecker.java b/src/com/android/wallpaper/module/RotatingWallpaperComponentChecker.java
index e60a90d..8a2908a 100755
--- a/src/com/android/wallpaper/module/RotatingWallpaperComponentChecker.java
+++ b/src/com/android/wallpaper/module/RotatingWallpaperComponentChecker.java

@@ -16,7 +16,8 @@
 package com.android.wallpaper.module;
 
 import android.content.Context;
-import android.support.annotation.IntDef;
+
+import androidx.annotation.IntDef;
 
 /**
  * Checks what component is responsible for presenting the rotating wallpaper image under the

diff --git a/src/com/android/wallpaper/module/UserEventLogger.java b/src/com/android/wallpaper/module/UserEventLogger.java
index 4fb2b0d..5952396 100755
--- a/src/com/android/wallpaper/module/UserEventLogger.java
+++ b/src/com/android/wallpaper/module/UserEventLogger.java

@@ -15,10 +15,10 @@
  */
 package com.android.wallpaper.module;
 
-import android.support.annotation.IntDef;
-
 import com.android.wallpaper.module.WallpaperPersister.WallpaperPosition;
 
+import androidx.annotation.IntDef;
+
 /**
  * Interface for logging user events in the wallpaper picker.
  */
@@ -44,6 +44,10 @@
     int DAILY_WALLPAPER_METADATA_FAILURE_SERVER_ERROR = 3;
     int DAILY_WALLPAPER_METADATA_FAILURE_TIMEOUT = 4;
 
+    void logResumed();
+
+    void logStopped();
+
     void logAppLaunched();
 
     void logDailyRefreshTurnedOn();
@@ -85,26 +89,6 @@
     void logDailyWallpaperRotationHour(int hour);
 
     /**
-     * Logs that the user is a 1 day active.
-     */
-    void log1DayActive();
-
-    /**
-     * Logs that the user is a 7 day active.
-     */
-    void log7DayActive();
-
-    /**
-     * Logs that the user is a 14 day active.
-     */
-    void log14DayActive();
-
-    /**
-     * Logs that the user is a 28 day active.
-     */
-    void log28DayActive();
-
-    /**
      * Logs whether the image file for the daily wallpaper "rotating image wallpaper" is successfully
      * decoded as a bitmap.
      *
@@ -178,11 +162,6 @@
     void logRestored();
 
     /**
-     * Logs the wallpaper position of a custom photo wallpaper set by the user on desktop.
-     */
-    void logWallpaperPosition(@WallpaperPosition int wallpaperPosition);
-
-    /**
      * Possible results of a "set wallpaper" operation.
      */
     @IntDef({

diff --git a/src/com/android/wallpaper/module/WallpaperPersister.java b/src/com/android/wallpaper/module/WallpaperPersister.java
index bb59cb1..59fb61f 100755
--- a/src/com/android/wallpaper/module/WallpaperPersister.java
+++ b/src/com/android/wallpaper/module/WallpaperPersister.java

@@ -18,14 +18,15 @@
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
 
 import com.android.wallpaper.asset.Asset;
 import com.android.wallpaper.model.WallpaperInfo;
 
 import java.util.List;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+
 /**
  * Interface for classes which persist wallpapers to the system.
  */

diff --git a/src/com/android/wallpaper/module/WallpaperPreferences.java b/src/com/android/wallpaper/module/WallpaperPreferences.java
index 2427f23..aa964cd 100755
--- a/src/com/android/wallpaper/module/WallpaperPreferences.java
+++ b/src/com/android/wallpaper/module/WallpaperPreferences.java

@@ -17,11 +17,12 @@
 
 import android.annotation.TargetApi;
 import android.os.Build;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
 
 import java.util.List;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+
 /**
  * Interface for persisting and retrieving wallpaper specific preferences.
  */

diff --git a/src/com/android/wallpaper/module/WallpaperRefresher.java b/src/com/android/wallpaper/module/WallpaperRefresher.java
index 52e9ccf..f203b79 100755
--- a/src/com/android/wallpaper/module/WallpaperRefresher.java
+++ b/src/com/android/wallpaper/module/WallpaperRefresher.java

@@ -15,11 +15,11 @@
  */
 package com.android.wallpaper.module;
 
-import android.support.annotation.Nullable;
-
 import com.android.wallpaper.model.WallpaperMetadata;
 import com.android.wallpaper.module.WallpaperPreferences.PresentationMode;
 
+import androidx.annotation.Nullable;
+
 /**
  * Interface for classes which refresh stored wallpaper metadata against the currently set
  * wallpaper.

diff --git a/src/com/android/wallpaper/module/WallpaperSetter.java b/src/com/android/wallpaper/module/WallpaperSetter.java
new file mode 100644
index 0000000..2fb00a8
--- /dev/null
+++ b/src/com/android/wallpaper/module/WallpaperSetter.java

@@ -0,0 +1,255 @@
+package com.android.wallpaper.module;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.app.WallpaperManager;
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.graphics.Rect;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.FragmentManager;
+
+import com.android.wallpaper.R;
+import com.android.wallpaper.asset.Asset;
+import com.android.wallpaper.model.LiveWallpaperInfo;
+import com.android.wallpaper.model.WallpaperInfo;
+import com.android.wallpaper.module.UserEventLogger.WallpaperSetFailureReason;
+import com.android.wallpaper.module.WallpaperPersister.Destination;
+import com.android.wallpaper.module.WallpaperPersister.SetWallpaperCallback;
+import com.android.wallpaper.picker.SetWallpaperDialogFragment;
+import com.android.wallpaper.picker.SetWallpaperDialogFragment.Listener;
+import com.android.wallpaper.util.ThrowableAnalyzer;
+
+import com.bumptech.glide.Glide;
+
+import java.io.IOException;
+
+/**
+ * Helper class used to set the current wallpaper. It handles showing the destination request dialog
+ * and actually setting the wallpaper on a given destination.
+ * It is expected to be instantiated within a Fragment or Activity, and {@link #cleanUp()} should
+ * be called from its owner's onDestroy method (or equivalent).
+ */
+public class WallpaperSetter {
+
+    private static final String PROGRESS_DIALOG_NO_TITLE = null;
+    private static final boolean PROGRESS_DIALOG_INDETERMINATE = true;
+
+    private static final int UNUSED_REQUEST_CODE = 1;
+    private static final String TAG_SET_WALLPAPER_DIALOG_FRAGMENT = "set_wallpaper_dialog";
+
+    private final WallpaperPersister mWallpaperPersister;
+    private final WallpaperPreferences mPreferences;
+    private final boolean mTestingModeEnabled;
+    private final UserEventLogger mUserEventLogger;
+    private ProgressDialog mProgressDialog;
+    private int mCurrentScreenOrientation;
+
+    public WallpaperSetter(WallpaperPersister wallpaperPersister,
+            WallpaperPreferences preferences, UserEventLogger userEventLogger,
+            boolean isTestingModeEnabled) {
+        mTestingModeEnabled = isTestingModeEnabled;
+        mWallpaperPersister = wallpaperPersister;
+        mPreferences = preferences;
+        mUserEventLogger = userEventLogger;
+    }
+
+    /**
+     * Sets current wallpaper to the device based on current zoom and scroll state.
+     *
+     * @param containerActivity main Activity that owns the current fragment
+     * @param wallpaper info for the actual wallpaper to set
+     * @param wallpaperAsset  Wallpaper asset from which to retrieve image data.
+     * @param destination The wallpaper destination i.e. home vs. lockscreen vs. both.
+     * @param wallpaperScale Scaling factor applied to the source image before setting the
+     *                       wallpaper to the device.
+     * @param cropRect Desired crop area of the wallpaper in post-scale units. If null, then the
+     *                 wallpaper image will be set without any scaling or cropping.
+     * @param callback optional callback to be notified when the wallpaper is set.
+     */
+    public void setCurrentWallpaper(Activity containerActivity, WallpaperInfo wallpaper,
+            Asset wallpaperAsset, @Destination final int destination, float wallpaperScale,
+            @Nullable Rect cropRect, @Nullable SetWallpaperCallback callback) {
+        if (wallpaper instanceof LiveWallpaperInfo) {
+            setCurrentLiveWallpaper(containerActivity, (LiveWallpaperInfo) wallpaper, destination,
+                    callback);
+            return;
+        }
+        mPreferences.setPendingWallpaperSetStatus(
+                WallpaperPreferences.WALLPAPER_SET_PENDING);
+
+        // Save current screen rotation so we can temporarily disable rotation while setting the
+        // wallpaper and restore after setting the wallpaper finishes.
+        saveAndLockScreenOrientation(containerActivity);
+
+        // Clear MosaicView tiles and Glide's cache and pools to reclaim memory for final cropped
+        // bitmap.
+        Glide.get(containerActivity).clearMemory();
+
+        // ProgressDialog endlessly updates the UI thread, keeping it from going idle which therefore
+        // causes Espresso to hang once the dialog is shown.
+        if (!mTestingModeEnabled && !containerActivity.isFinishing()) {
+            int themeResId = (VERSION.SDK_INT < VERSION_CODES.LOLLIPOP)
+                    ? R.style.ProgressDialogThemePreL : R.style.LightDialogTheme;
+            mProgressDialog = new ProgressDialog(containerActivity, themeResId);
+
+            mProgressDialog.setTitle(PROGRESS_DIALOG_NO_TITLE);
+            mProgressDialog.setMessage(containerActivity.getString(
+                            R.string.set_wallpaper_progress_message));
+            mProgressDialog.setIndeterminate(PROGRESS_DIALOG_INDETERMINATE);
+            mProgressDialog.show();
+        }
+
+        mWallpaperPersister.setIndividualWallpaper(
+                wallpaper, wallpaperAsset, cropRect,
+                wallpaperScale, destination, new SetWallpaperCallback() {
+                    @Override
+                    public void onSuccess() {
+                        onWallpaperApplied(wallpaper, containerActivity);
+                        if (callback != null) {
+                            callback.onSuccess();
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable throwable) {
+                        onWallpaperApplyError(throwable, containerActivity);
+                        if (callback != null) {
+                            callback.onError(throwable);
+                        }
+                    }
+                });
+    }
+
+    public void setCurrentLiveWallpaper(Activity activity, LiveWallpaperInfo wallpaper,
+            @Destination final int destination, @Nullable SetWallpaperCallback callback) {
+        try {
+            // Save current screen rotation so we can temporarily disable rotation while setting the
+            // wallpaper and restore after setting the wallpaper finishes.
+            saveAndLockScreenOrientation(activity);
+
+            if (destination == WallpaperPersister.DEST_LOCK_SCREEN) {
+                throw new IllegalArgumentException(
+                        "Live wallpaper cannot be applied on lock screen only");
+            }
+            WallpaperManager wallpaperManager = WallpaperManager.getInstance(activity);
+            wallpaperManager.setWallpaperComponent(
+                    wallpaper.getWallpaperComponent().getComponent());
+            wallpaperManager.setWallpaperOffsetSteps(0.5f /* xStep */, 0.0f /* yStep */);
+            wallpaperManager.setWallpaperOffsets(
+                    activity.getWindow().getDecorView().getRootView().getWindowToken(),
+                    0.5f /* xOffset */, 0.0f /* yOffset */);
+            if (destination == WallpaperPersister.DEST_BOTH) {
+                wallpaperManager.clear(WallpaperManager.FLAG_LOCK);
+            }
+            onWallpaperApplied(wallpaper, activity);
+            if (callback != null) {
+                callback.onSuccess();
+            }
+        } catch (RuntimeException | IOException e) {
+            onWallpaperApplyError(e, activity);
+            if (callback != null) {
+                callback.onError(e);
+            }
+        }
+
+    }
+
+    private void onWallpaperApplied(WallpaperInfo wallpaper, Activity containerActivity) {
+        mUserEventLogger.logWallpaperSet(
+                wallpaper.getCollectionId(containerActivity),
+                wallpaper.getWallpaperId());
+        mPreferences.setPendingWallpaperSetStatus(
+                WallpaperPreferences.WALLPAPER_SET_NOT_PENDING);
+        mUserEventLogger.logWallpaperSetResult(
+                UserEventLogger.WALLPAPER_SET_RESULT_SUCCESS);
+
+        cleanUp();
+        restoreScreenOrientation(containerActivity);
+    }
+
+    private void onWallpaperApplyError(Throwable throwable, Activity containerActivity) {
+        mPreferences.setPendingWallpaperSetStatus(
+                WallpaperPreferences.WALLPAPER_SET_NOT_PENDING);
+        mUserEventLogger.logWallpaperSetResult(
+                UserEventLogger.WALLPAPER_SET_RESULT_FAILURE);
+        @WallpaperSetFailureReason int failureReason = ThrowableAnalyzer.isOOM(
+                throwable)
+                ? UserEventLogger.WALLPAPER_SET_FAILURE_REASON_OOM
+                : UserEventLogger.WALLPAPER_SET_FAILURE_REASON_OTHER;
+        mUserEventLogger.logWallpaperSetFailureReason(failureReason);
+
+        cleanUp();
+        restoreScreenOrientation(containerActivity);
+    }
+
+    /**
+     * Call this method to clean up this instance's state.
+     */
+    public void cleanUp() {
+        if (mProgressDialog != null) {
+            mProgressDialog.dismiss();
+            mProgressDialog = null;
+        }
+    }
+
+    /**
+     * Show a dialog asking the user for the Wallpaper's destination
+     * (eg, "Home screen", "Lock Screen")
+     * @param listener {@link SetWallpaperDialogFragment.Listener} that will receive the response.
+     * @see Destination
+     */
+    public void requestDestination(Context context, FragmentManager fragmentManager,
+            WallpaperInfo wallpaper, Listener listener) {
+        requestDestination(context, fragmentManager, R.string.set_wallpaper_dialog_message,
+                wallpaper, listener);
+    }
+
+    /**
+     * Show a dialog asking the user for the Wallpaper's destination
+     * (eg, "Home screen", "Lock Screen")
+     * @param listener {@link SetWallpaperDialogFragment.Listener} that will receive the response.
+     * @param titleResId title for the dialog
+     * @see Destination
+     */
+    public void requestDestination(Context context, FragmentManager fragmentManager,
+            @StringRes int titleResId, WallpaperInfo wallpaper, Listener listener) {
+        CurrentWallpaperInfoFactory factory = InjectorProvider.getInjector()
+                .getCurrentWallpaperFactory(context);
+
+        factory.createCurrentWallpaperInfos((homeWallpaper, lockWallpaper, presentationMode) -> {
+            SetWallpaperDialogFragment setWallpaperDialog = new SetWallpaperDialogFragment();
+            setWallpaperDialog.setTitleResId(titleResId);
+            setWallpaperDialog.setListener(listener);
+            if (homeWallpaper instanceof LiveWallpaperInfo && lockWallpaper == null) {
+                if (wallpaper instanceof LiveWallpaperInfo) {
+                    // If lock wallpaper is live and we're setting a live wallpaper, we can only
+                    // set it to both, so bypass the dialog.
+                    listener.onSetBoth();
+                    return;
+                }
+                // if the lock wallpaper is a live wallpaper, we cannot set a home-only static one
+                setWallpaperDialog.setHomeOptionAvailable(false);
+            }
+            if (wallpaper instanceof LiveWallpaperInfo) {
+                setWallpaperDialog.setLockOptionAvailable(false);
+            }
+            setWallpaperDialog.show(fragmentManager, TAG_SET_WALLPAPER_DIALOG_FRAGMENT);
+        }, true); // Force refresh as the wallpaper may have been set while this fragment was paused
+    }
+
+    private void saveAndLockScreenOrientation(Activity activity) {
+        mCurrentScreenOrientation = activity.getRequestedOrientation();
+            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+    }
+
+    private void restoreScreenOrientation(Activity activity) {
+        if (activity.getRequestedOrientation() != mCurrentScreenOrientation) {
+            activity.setRequestedOrientation(mCurrentScreenOrientation);
+        }
+    }
+}
\ No newline at end of file

diff --git a/src/com/android/wallpaper/network/WallpaperRequester.java b/src/com/android/wallpaper/network/WallpaperRequester.java
index 55a6764..2f099ab 100755
--- a/src/com/android/wallpaper/network/WallpaperRequester.java
+++ b/src/com/android/wallpaper/network/WallpaperRequester.java

@@ -89,6 +89,7 @@
                     .asBitmap()
                     .load(imageUrl)
                     .apply(RequestOptions.noTransformation())
+                    .apply(RequestOptions.option(HttpGlideUrlLoader.TIMEOUT, LONG_TIMEOUT_MS))
                     .into(target);
         } catch (Exception e) {
             Log.e(TAG, "Unable to get Bitmap for image with url: " + imageUrl, e);

diff --git a/src/com/android/wallpaper/picker/BaseActivity.java b/src/com/android/wallpaper/picker/BaseActivity.java
index 0af06c7..7f2ea60 100755
--- a/src/com/android/wallpaper/picker/BaseActivity.java
+++ b/src/com/android/wallpaper/picker/BaseActivity.java

@@ -15,7 +15,7 @@
  */
 package com.android.wallpaper.picker;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Base activity that keeps track of whether fragment transactions are safe to commit given the

diff --git a/src/com/android/wallpaper/picker/CategoryPickerFragment.java b/src/com/android/wallpaper/picker/CategoryFragment.java
similarity index 95%
rename from src/com/android/wallpaper/picker/CategoryPickerFragment.java
rename to src/com/android/wallpaper/picker/CategoryFragment.java
index 4318315..76f857b 100755
--- a/src/com/android/wallpaper/picker/CategoryPickerFragment.java
+++ b/src/com/android/wallpaper/picker/CategoryFragment.java

@@ -15,11 +15,11 @@
  */
 package com.android.wallpaper.picker;
 
+import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.LauncherApps;
 import android.content.pm.PackageManager;
 import android.graphics.Point;
 import android.graphics.PorterDuff.Mode;
@@ -29,14 +29,6 @@
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.service.wallpaper.WallpaperService;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.GridLayoutManager.SpanSizeLookup;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -54,31 +46,36 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 import com.android.wallpaper.R;
 import com.android.wallpaper.asset.Asset;
 import com.android.wallpaper.compat.ButtonDrawableSetterCompat;
 import com.android.wallpaper.config.Flags;
 import com.android.wallpaper.model.Category;
-import com.android.wallpaper.model.ThirdPartyAppCategory;
-import com.android.wallpaper.model.WallpaperCategory;
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.module.CurrentWallpaperInfoFactory;
 import com.android.wallpaper.module.CurrentWallpaperInfoFactory.WallpaperInfoCallback;
 import com.android.wallpaper.module.ExploreIntentChecker;
-import com.android.wallpaper.module.Injector;
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.module.LockWallpaperStatusChecker;
-import com.android.wallpaper.module.PackageStatusNotifier;
 import com.android.wallpaper.module.UserEventLogger;
 import com.android.wallpaper.module.WallpaperPreferences;
 import com.android.wallpaper.module.WallpaperPreferences.PresentationMode;
 import com.android.wallpaper.module.WallpaperRotationRefresher;
 import com.android.wallpaper.module.WallpaperRotationRefresher.Listener;
-import com.android.wallpaper.picker.MyPhotosLauncher.PermissionChangedListener;
+import com.android.wallpaper.picker.MyPhotosStarter.MyPhotosStarterProvider;
+import com.android.wallpaper.picker.MyPhotosStarter.PermissionChangedListener;
 import com.android.wallpaper.util.DisplayMetricsRetriever;
 import com.android.wallpaper.util.ScreenSizeCalculator;
 import com.android.wallpaper.util.TileSizeCalculator;
 import com.android.wallpaper.widget.GridMarginDecoration;
+
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.MemoryCategory;
 
@@ -87,10 +84,31 @@
 import java.util.List;
 
 /**
- * Displays the Main UI for picking an category of wallpapers to choose from.
+ * Displays the Main UI for picking a category of wallpapers to choose from.
  */
-public class CategoryPickerFragment extends Fragment {
-    private static final String TAG = "CategoryPickerFragment";
+public class CategoryFragment extends ToolbarFragment {
+
+    /**
+     * Interface to be implemented by an Activity hosting a {@link CategoryFragment}
+     */
+    public interface CategoryFragmentHost extends MyPhotosStarterProvider {
+
+        void requestExternalStoragePermission(PermissionChangedListener listener);
+
+        boolean isReadExternalStoragePermissionGranted();
+
+        void showViewOnlyPreview(WallpaperInfo wallpaperInfo);
+
+        void show(String collectionId);
+    }
+
+    public static CategoryFragment newInstance(CharSequence title) {
+        CategoryFragment fragment = new CategoryFragment();
+        fragment.setArguments(ToolbarFragment.createArguments(title));
+        return fragment;
+    }
+
+    private static final String TAG = "CategoryFragment";
 
     // The number of ViewHolders that don't pertain to category tiles.
     // Currently 2: one for the metadata section and one for the "Select wallpaper" header.
@@ -109,19 +127,18 @@
 
     private RecyclerView mImageGrid;
     private CategoryAdapter mAdapter;
-    private ArrayList<Category> mCategories;
+    private ArrayList<Category> mCategories = new ArrayList<>();
     private Point mTileSizePx;
     private boolean mAwaitingCategories;
     private ProgressDialog mRefreshWallpaperProgressDialog;
     private boolean mTestingMode;
 
-    public CategoryPickerFragment() {
+    public CategoryFragment() {
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mCategories = new ArrayList<>();
         mAdapter = new CategoryAdapter(mCategories);
     }
 
@@ -146,11 +163,16 @@
         GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), getNumColumns());
         gridLayoutManager.setSpanSizeLookup(new CategorySpanSizeLookup(mAdapter));
         mImageGrid.setLayoutManager(gridLayoutManager);
-
+        setUpToolbar(view);
         return view;
     }
 
     @Override
+    public CharSequence getDefaultTitle() {
+        return getContext().getString(R.string.app_name);
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
@@ -200,6 +222,10 @@
             mAdapter.notifyItemInserted(getNumColumns());
             mAwaitingCategories = true;
         }
+        // Not add existing category to category list
+        if (mCategories.indexOf(category) >= 0) {
+            return;
+        }
 
         int priority = category.getPriority();
 
@@ -238,7 +264,7 @@
     }
 
     /**
-     * Notifies the CategoryPickerFragment that no further categories are expected so it may hide
+     * Notifies the CategoryFragment that no further categories are expected so it may hide
      * the loading indicator.
      */
     public void doneFetchingCategories() {
@@ -258,13 +284,18 @@
     }
 
     private boolean canShowCurrentWallpaper() {
-        TopLevelPickerActivity activity = (TopLevelPickerActivity) getActivity();
+        Activity activity = getActivity();
+        CategoryFragmentHost host = getFragmentHost();
         PackageManager packageManager = activity.getPackageManager();
         String packageName = activity.getPackageName();
 
         boolean hasReadWallpaperInternal = packageManager.checkPermission(
                 PERMISSION_READ_WALLPAPER_INTERNAL, packageName) == PackageManager.PERMISSION_GRANTED;
-        return hasReadWallpaperInternal || activity.isReadExternalStoragePermissionGranted();
+        return hasReadWallpaperInternal || host.isReadExternalStoragePermissionGranted();
+    }
+
+    private CategoryFragmentHost getFragmentHost() {
+        return (CategoryFragmentHost) getActivity();
     }
 
     /**
@@ -515,7 +546,7 @@
             mWallpaperImage.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    ((TopLevelPickerActivity) getActivity()).showViewOnlyPreview(mWallpaperInfo);
+                    getFragmentHost().showViewOnlyPreview(mWallpaperInfo);
                     eventLogger.logCurrentWallpaperPreviewed();
                 }
             });
@@ -799,7 +830,7 @@
                 @Override
                 public void onClick(View v) {
                     eventLogger.logCurrentWallpaperPreviewed();
-                    ((TopLevelPickerActivity) getActivity()).showViewOnlyPreview(mHomeWallpaperInfo);
+                    getFragmentHost().showViewOnlyPreview(mHomeWallpaperInfo);
                 }
             });
         }
@@ -879,7 +910,7 @@
                 @Override
                 public void onClick(View v) {
                     eventLogger.logCurrentWallpaperPreviewed();
-                    ((TopLevelPickerActivity) getActivity()).showViewOnlyPreview(mLockWallpaperInfo);
+                    getFragmentHost().showViewOnlyPreview(mLockWallpaperInfo);
                 }
             });
         }
@@ -914,7 +945,7 @@
             eventLogger.logCategorySelected(mCategory.getCollectionId());
 
             if (mCategory.supportsCustomPhotos()) {
-                ((MyPhotosLauncher) getActivity()).requestCustomPhotoPicker(
+                getFragmentHost().getMyPhotosStarter().requestCustomPhotoPicker(
                         new PermissionChangedListener() {
                             @Override
                             public void onPermissionsGranted() {
@@ -929,7 +960,7 @@
                 return;
             }
 
-            ((TopLevelPickerActivity) getActivity()).show(mCategory.getCollectionId());
+            getFragmentHost().show(mCategory.getCollectionId());
         }
 
         /**
@@ -1001,7 +1032,7 @@
             mAllowAccessButton =
                     (Button) view.findViewById(R.id.permission_needed_allow_access_button);
             mAllowAccessButton.setOnClickListener((View v) -> {
-                ((TopLevelPickerActivity) getActivity()).requestExternalStoragePermission(mAdapter);
+                getFragmentHost().requestExternalStoragePermission(mAdapter);
             });
 
             // Replace explanation text with text containing the Wallpapers app name which replaces the

diff --git a/src/com/android/wallpaper/picker/CurrentWallpaperBottomSheetPresenter.java b/src/com/android/wallpaper/picker/CurrentWallpaperBottomSheetPresenter.java
index 7ea6fef..5190ec0 100755
--- a/src/com/android/wallpaper/picker/CurrentWallpaperBottomSheetPresenter.java
+++ b/src/com/android/wallpaper/picker/CurrentWallpaperBottomSheetPresenter.java

@@ -15,7 +15,7 @@
  */
 package com.android.wallpaper.picker;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Interface for a presenter class which displays the currently set wallpaper(s) in the view.

diff --git a/src/com/android/wallpaper/picker/LoadWallpaperErrorDialogFragment.java b/src/com/android/wallpaper/picker/LoadWallpaperErrorDialogFragment.java
index 23a6417..0d9e9af 100755
--- a/src/com/android/wallpaper/picker/LoadWallpaperErrorDialogFragment.java
+++ b/src/com/android/wallpaper/picker/LoadWallpaperErrorDialogFragment.java

@@ -18,12 +18,13 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
 
 import com.android.wallpaper.R;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 /**
  * Dialog fragment which communicates a message that loading the wallpaper failed with an OK button,
  * when clicked will navigate the user back to the previous activity.

diff --git a/src/com/android/wallpaper/picker/MyPhotosLauncher.java b/src/com/android/wallpaper/picker/MyPhotosStarter.java
similarity index 87%
rename from src/com/android/wallpaper/picker/MyPhotosLauncher.java
rename to src/com/android/wallpaper/picker/MyPhotosStarter.java
index 58ea738..d79b3b5 100755
--- a/src/com/android/wallpaper/picker/MyPhotosLauncher.java
+++ b/src/com/android/wallpaper/picker/MyPhotosStarter.java

@@ -16,9 +16,9 @@
 package com.android.wallpaper.picker;
 
 /**
- * Interface for activities that launch an Android cutom image picker.
+ * Interface for activities that launch an Android custom image picker.
  */
-public interface MyPhotosLauncher {
+public interface MyPhotosStarter {
 
     /**
      * Requests that this Activity show the Android custom photo picker for the sake of picking a
@@ -43,4 +43,9 @@
          */
         void onPermissionsDenied(boolean dontAskAgain);
     }
+
+    interface MyPhotosStarterProvider {
+
+        MyPhotosStarter getMyPhotosStarter();
+    }
 }

diff --git a/src/com/android/wallpaper/picker/OfflineDesktopFragment.java b/src/com/android/wallpaper/picker/OfflineDesktopFragment.java
index a4ef525..8588648 100755
--- a/src/com/android/wallpaper/picker/OfflineDesktopFragment.java
+++ b/src/com/android/wallpaper/picker/OfflineDesktopFragment.java

@@ -16,13 +16,14 @@
 package com.android.wallpaper.picker;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.wallpaper.R;
 
+import androidx.fragment.app.Fragment;
+
 /**
  * Displays the UI on desktop mode indicating that wallpapers are unavailable while offline.
  */

diff --git a/src/com/android/wallpaper/picker/PreviewActivity.java b/src/com/android/wallpaper/picker/PreviewActivity.java
index d38e5fd..bbedb7f 100755
--- a/src/com/android/wallpaper/picker/PreviewActivity.java
+++ b/src/com/android/wallpaper/picker/PreviewActivity.java

@@ -18,14 +18,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
 
 import com.android.wallpaper.R;
 import com.android.wallpaper.model.InlinePreviewIntentFactory;
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.module.InjectorProvider;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 /**
  * Activity that displays a preview of a specific wallpaper and provides the ability to set the
  * wallpaper as the user's current wallpaper.

diff --git a/src/com/android/wallpaper/picker/PreviewFragment.java b/src/com/android/wallpaper/picker/PreviewFragment.java
index 1c3c56b..0ba9412 100755
--- a/src/com/android/wallpaper/picker/PreviewFragment.java
+++ b/src/com/android/wallpaper/picker/PreviewFragment.java

@@ -19,7 +19,6 @@
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
 import android.app.Activity;
-import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -38,16 +37,6 @@
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.os.Handler;
-import android.support.annotation.IntDef;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetBehavior.State;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Display;
 import android.view.LayoutInflater;
@@ -66,6 +55,14 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
 import com.android.wallpaper.R;
 import com.android.wallpaper.asset.Asset;
 import com.android.wallpaper.asset.Asset.BitmapReceiver;
@@ -73,26 +70,26 @@
 import com.android.wallpaper.compat.BuildCompat;
 import com.android.wallpaper.compat.ButtonDrawableSetterCompat;
 import com.android.wallpaper.config.Flags;
-import com.android.wallpaper.model.LiveWallpaperInfo;
 import com.android.wallpaper.model.WallpaperInfo;
-import com.android.wallpaper.module.CurrentWallpaperInfoFactory;
 import com.android.wallpaper.module.ExploreIntentChecker;
 import com.android.wallpaper.module.Injector;
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.module.UserEventLogger;
-import com.android.wallpaper.module.UserEventLogger.WallpaperSetFailureReason;
 import com.android.wallpaper.module.WallpaperPersister;
 import com.android.wallpaper.module.WallpaperPersister.Destination;
 import com.android.wallpaper.module.WallpaperPersister.SetWallpaperCallback;
 import com.android.wallpaper.module.WallpaperPreferences;
+import com.android.wallpaper.module.WallpaperSetter;
 import com.android.wallpaper.util.ScreenSizeCalculator;
-import com.android.wallpaper.util.ThrowableAnalyzer;
 import com.android.wallpaper.util.WallpaperCropUtils;
 import com.android.wallpaper.widget.MaterialProgressDrawable;
+
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.MemoryCategory;
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetBehavior.State;
 
 import java.util.Date;
 import java.util.List;
@@ -130,14 +127,11 @@
     protected static final String ARG_TESTING_MODE_ENABLED = "testing_mode_enabled";
     private static final String TAG_LOAD_WALLPAPER_ERROR_DIALOG_FRAGMENT =
             "load_wallpaper_error_dialog";
-    private static final String TAG_SET_WALLPAPER_DIALOG_FRAGMENT = "set_wallpaper_dialog";
     private static final String TAG_SET_WALLPAPER_ERROR_DIALOG_FRAGMENT =
             "set_wallpaper_error_dialog";
     private static final int UNUSED_REQUEST_CODE = 1;
     private static final float DEFAULT_WALLPAPER_MAX_ZOOM = 8f;
     private static final String TAG = "PreviewFragment";
-    private static final String PROGRESS_DIALOG_NO_TITLE = null;
-    private static final boolean PROGRESS_DIALOG_INDETERMINATE = true;
     private static final float PAGE_BITMAP_MAX_HEAP_RATIO = 0.25f;
     private static final String KEY_BOTTOM_SHEET_STATE = "key_bottom_sheet_state";
 
@@ -154,8 +148,7 @@
     protected SubsamplingScaleImageView mFullResImageView;
     protected WallpaperInfo mWallpaper;
     private Asset mWallpaperAsset;
-    private WallpaperPersister mWallpaperPersister;
-    private WallpaperPreferences mPreferences;
+    private WallpaperSetter mWallpaperSetter;;
     private UserEventLogger mUserEventLogger;
     private LinearLayout mBottomSheet;
     private TextView mAttributionTitle;
@@ -165,7 +158,6 @@
     private Button mAttributionExploreButton;
     private ImageView mPreviewPaneArrow;
     private int mCurrentScreenOrientation;
-    private ProgressDialog mProgressDialog;
     private Point mDefaultCropSurfaceSize;
     private Point mScreenSize;
     private Point mRawWallpaperSize; // Native size of wallpaper image.
@@ -210,14 +202,14 @@
         Context appContext = activity.getApplicationContext();
         Injector injector = InjectorProvider.getInjector();
 
-        mWallpaperPersister = injector.getWallpaperPersister(appContext);
-        mPreferences = injector.getPreferences(appContext);
         mUserEventLogger = injector.getUserEventLogger(appContext);
         mWallpaper = getArguments().getParcelable(ARG_WALLPAPER);
         mWallpaperAsset = mWallpaper.getAsset(appContext);
         //noinspection ResourceType
         mPreviewMode = getArguments().getInt(ARG_PREVIEW_MODE);
         mTestingModeEnabled = getArguments().getBoolean(ARG_TESTING_MODE_ENABLED);
+        mWallpaperSetter = new WallpaperSetter(injector.getWallpaperPersister(appContext),
+                injector.getPreferences(appContext), mUserEventLogger, mTestingModeEnabled);
 
         setHasOptionsMenu(true);
 
@@ -269,18 +261,18 @@
         /* bottom */ 0);
 
         mFullResImageView = view.findViewById(R.id.full_res_image);
-        mLoadingIndicator = (ImageView) view.findViewById(R.id.loading_indicator);
+        mLoadingIndicator = view.findViewById(R.id.loading_indicator);
 
-        mBottomSheet = (LinearLayout) view.findViewById(R.id.bottom_sheet);
-        mAttributionTitle = (TextView) view.findViewById(R.id.preview_attribution_pane_title);
-        mAttributionSubtitle1 = (TextView) view.findViewById(R.id.preview_attribution_pane_subtitle1);
-        mAttributionSubtitle2 = (TextView) view.findViewById(R.id.preview_attribution_pane_subtitle2);
-        mAttributionExploreSection = (FrameLayout) view.findViewById(
+        mBottomSheet = view.findViewById(R.id.bottom_sheet);
+        mAttributionTitle = view.findViewById(R.id.preview_attribution_pane_title);
+        mAttributionSubtitle1 = view.findViewById(R.id.preview_attribution_pane_subtitle1);
+        mAttributionSubtitle2 = view.findViewById(R.id.preview_attribution_pane_subtitle2);
+        mAttributionExploreSection = view.findViewById(
                 R.id.preview_attribution_pane_explore_section);
-        mAttributionExploreButton = (Button) view.findViewById(
+        mAttributionExploreButton = view.findViewById(
                 R.id.preview_attribution_pane_explore_button);
-        mPreviewPaneArrow = (ImageView) view.findViewById(R.id.preview_attribution_pane_arrow);
-        mLowResImageView = (ImageView) view.findViewById(R.id.low_res_image);
+        mPreviewPaneArrow = view.findViewById(R.id.preview_attribution_pane_arrow);
+        mLowResImageView = view.findViewById(R.id.low_res_image);
 
         mPreviewPaneArrow.setColorFilter(
                 getResources().getColor(R.color.preview_pane_arrow_color), Mode.SRC_IN);
@@ -361,6 +353,7 @@
             }
         }, 500);
 
+
         mBottomSheetInitialState = (savedInstanceState == null)
                 ? BottomSheetBehavior.STATE_EXPANDED
                 : savedInstanceState.getInt(KEY_BOTTOM_SHEET_STATE,
@@ -415,7 +408,8 @@
         int id = item.getItemId();
         if (id == R.id.set_wallpaper) {
             if (BuildCompat.isAtLeastN()) {
-                requestDestination();
+                mWallpaperSetter.requestDestination(getContext(), getFragmentManager(), mWallpaper,
+                        this);
             } else {
                 setCurrentWallpaper(WallpaperPersister.DEST_HOME_SCREEN);
             }
@@ -432,21 +426,6 @@
         return false;
     }
 
-    private void requestDestination() {
-        CurrentWallpaperInfoFactory factory = InjectorProvider.getInjector()
-                .getCurrentWallpaperFactory(getContext());
-
-        factory.createCurrentWallpaperInfos((homeWallpaper, lockWallpaper, presentationMode) -> {
-            SetWallpaperDialogFragment setWallpaperDialog = new SetWallpaperDialogFragment();
-            setWallpaperDialog.setTargetFragment(this, UNUSED_REQUEST_CODE);
-            if (homeWallpaper instanceof LiveWallpaperInfo && lockWallpaper == null) {
-                // if the lock wallpaper is a live wallpaper, we cannot set a home-only static one
-                setWallpaperDialog.setHomeOptionAvailable(false);
-            }
-            setWallpaperDialog.show(getFragmentManager(), TAG_SET_WALLPAPER_DIALOG_FRAGMENT);
-        }, true); // Force refresh as the wallpaper may have been set while this fragment was paused
-    }
-
     @Override
     public void onSetHomeScreen() {
         setCurrentWallpaper(WallpaperPersister.DEST_HOME_SCREEN);
@@ -478,9 +457,7 @@
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (mProgressDialog != null) {
-            mProgressDialog.dismiss();
-        }
+        mWallpaperSetter.cleanUp();
         if (mProgressDrawable != null) {
             mProgressDrawable.stop();
         }
@@ -700,20 +677,6 @@
 
                             setDefaultWallpaperZoomAndScroll();
                             crossFadeInMosaicView();
-
-                            // Record memory snapshot of app one second delayed to allow time for MosaicView tiles
-                            // to be decoded and overlaid on top of the page bitmap.
-                            new Handler().postDelayed(new Runnable() {
-                                @Override
-                                public void run() {
-                                    if (getActivity() == null) {
-                                        return;
-                                    }
-
-                                    InjectorProvider.getInjector().getPerformanceMonitor()
-                                            .recordFullResPreviewLoadedMemorySnapshot();
-                                }
-                            }, 1000);
                         }
                         if (mProgressDrawable != null) {
                             mProgressDrawable.stop();
@@ -848,80 +811,16 @@
      * @param destination The wallpaper destination i.e. home vs. lockscreen vs. both.
      */
     private void setCurrentWallpaper(@Destination final int destination) {
-        mPreferences.setPendingWallpaperSetStatus(WallpaperPreferences.WALLPAPER_SET_PENDING);
-
-        // Save current screen rotation so we can temporarily disable rotation while setting the
-        // wallpaper and restore after setting the wallpaper finishes.
-        saveAndLockScreenOrientation();
-
-        // Clear MosaicView tiles and Glide's cache and pools to reclaim memory for final cropped
-        // bitmap.
-        Glide.get(getActivity()).clearMemory();
-
-        // ProgressDialog endlessly updates the UI thread, keeping it from going idle which therefore
-        // causes Espresso to hang once the dialog is shown.
-        if (!mTestingModeEnabled) {
-            int themeResId;
-            if (VERSION.SDK_INT < VERSION_CODES.LOLLIPOP) {
-                themeResId = R.style.ProgressDialogThemePreL;
-            } else {
-                themeResId = R.style.LightDialogTheme;
-            }
-            mProgressDialog = new ProgressDialog(getActivity(), themeResId);
-
-            mProgressDialog.setTitle(PROGRESS_DIALOG_NO_TITLE);
-            mProgressDialog.setMessage(
-                    getResources().getString(R.string.set_wallpaper_progress_message));
-            mProgressDialog.setIndeterminate(PROGRESS_DIALOG_INDETERMINATE);
-            mProgressDialog.show();
-        }
-
-        float wallpaperScale = mFullResImageView.getScale();
-        Rect cropRect = calculateCropRect();
-        mWallpaperPersister.setIndividualWallpaper(mWallpaper, mWallpaperAsset, cropRect,
-                wallpaperScale, destination, new SetWallpaperCallback() {
+        mWallpaperSetter.setCurrentWallpaper(getActivity(), mWallpaper, mWallpaperAsset,
+                destination, mFullResImageView.getScale(), calculateCropRect(),
+                new SetWallpaperCallback() {
                     @Override
                     public void onSuccess() {
-                        Context context = getContext();
-                        mUserEventLogger.logWallpaperSet(
-                                mWallpaper.getCollectionId(context),
-                                mWallpaper.getWallpaperId());
-                        mPreferences.setPendingWallpaperSetStatus(
-                                WallpaperPreferences.WALLPAPER_SET_NOT_PENDING);
-                        mUserEventLogger.logWallpaperSetResult(
-                                UserEventLogger.WALLPAPER_SET_RESULT_SUCCESS);
-
-                        if (getActivity() == null) {
-                            return;
-                        }
-
-                        if (mProgressDialog != null) {
-                            mProgressDialog.dismiss();
-                        }
-
-                        restoreScreenOrientation();
                         finishActivityWithResultOk();
                     }
 
                     @Override
-                    public void onError(Throwable throwable) {
-                        mPreferences.setPendingWallpaperSetStatus(
-                                WallpaperPreferences.WALLPAPER_SET_NOT_PENDING);
-                        mUserEventLogger.logWallpaperSetResult(
-                                UserEventLogger.WALLPAPER_SET_RESULT_FAILURE);
-                        @WallpaperSetFailureReason int failureReason = ThrowableAnalyzer.isOOM(throwable)
-                                ? UserEventLogger.WALLPAPER_SET_FAILURE_REASON_OOM
-                                : UserEventLogger.WALLPAPER_SET_FAILURE_REASON_OTHER;
-                        mUserEventLogger.logWallpaperSetFailureReason(failureReason);
-
-                        if (getActivity() == null) {
-                            return;
-                        }
-
-                        if (mProgressDialog != null) {
-                            mProgressDialog.dismiss();
-                        }
-                        restoreScreenOrientation();
+                    public void onError(@Nullable Throwable throwable) {
                         showSetWallpaperErrorDialog(destination);
                     }
                 });

diff --git a/src/com/android/wallpaper/picker/SetWallpaperDialogFragment.java b/src/com/android/wallpaper/picker/SetWallpaperDialogFragment.java
index 8212fdd..cc9e348 100755
--- a/src/com/android/wallpaper/picker/SetWallpaperDialogFragment.java
+++ b/src/com/android/wallpaper/picker/SetWallpaperDialogFragment.java

@@ -18,12 +18,14 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.view.ContextThemeWrapper;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.fragment.app.DialogFragment;
+
 import com.android.wallpaper.R;
 import com.android.wallpaper.compat.ButtonDrawableSetterCompat;
 
@@ -38,6 +40,9 @@
     private Button mSetBothWallpaperButton;
 
     private boolean mHomeAvailable = true;
+    private boolean mLockAvailable = true;
+    private Listener mListener;
+    private int mTitleResId;
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -45,9 +50,6 @@
 
         Context context = getContext();
 
-        int titleResId = R.string.set_wallpaper_dialog_message;
-        final Listener callback = (Listener) getTargetFragment();
-
         @SuppressWarnings("RestrictTo")
         View layout =
                 View.inflate(
@@ -55,42 +57,33 @@
                         R.layout.dialog_set_wallpaper,
                         null);
 
-        AlertDialog dialog = new AlertDialog.Builder(getActivity(), R.style.LightDialogTheme)
-                .setTitle(titleResId)
+        AlertDialog dialog = new AlertDialog.Builder(context, R.style.LightDialogTheme)
+                .setTitle(mTitleResId)
                 .setView(layout)
                 .create();
 
         mSetHomeWallpaperButton = layout.findViewById(R.id.set_home_wallpaper_button);
-        mSetHomeWallpaperButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                callback.onSetHomeScreen();
-                dismiss();
-            }
+        mSetHomeWallpaperButton.setOnClickListener(v -> {
+            mListener.onSetHomeScreen();
+            dismiss();
         });
         ButtonDrawableSetterCompat.setDrawableToButtonStart(
                 mSetHomeWallpaperButton,
                 context.getDrawable(R.drawable.ic_home_24px));
 
         mSetLockWallpaperButton = layout.findViewById(R.id.set_lock_wallpaper_button);
-        mSetLockWallpaperButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                callback.onSetLockScreen();
-                dismiss();
-            }
+        mSetLockWallpaperButton.setOnClickListener(v -> {
+            mListener.onSetLockScreen();
+            dismiss();
         });
         ButtonDrawableSetterCompat.setDrawableToButtonStart(
                 mSetLockWallpaperButton,
                 context.getDrawable(R.drawable.ic_lock_outline_24px));
 
         mSetBothWallpaperButton = layout.findViewById(R.id.set_both_wallpaper_button);
-        mSetBothWallpaperButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                callback.onSetBoth();
-                dismiss();
-            }
+        mSetBothWallpaperButton.setOnClickListener(v -> {
+            mListener.onSetBoth();
+            dismiss();
         });
         ButtonDrawableSetterCompat.setDrawableToButtonStart(
                 mSetBothWallpaperButton,
@@ -106,10 +99,26 @@
         updateButtonsVisibility();
     }
 
+    public void setLockOptionAvailable(boolean lockAvailable) {
+        mLockAvailable = lockAvailable;
+        updateButtonsVisibility();
+    }
+
+    public void setTitleResId(@StringRes int titleResId) {
+        mTitleResId = titleResId;
+    }
+
+    public void setListener(Listener listener) {
+        mListener = listener;
+    }
+
     private void updateButtonsVisibility() {
         if (mSetHomeWallpaperButton != null) {
             mSetHomeWallpaperButton.setVisibility(mHomeAvailable ? View.VISIBLE : View.GONE);
         }
+        if (mSetLockWallpaperButton != null) {
+            mSetLockWallpaperButton.setVisibility(mLockAvailable ? View.VISIBLE : View.GONE);
+        }
     }
 
     /**

diff --git a/src/com/android/wallpaper/picker/SetWallpaperErrorDialogFragment.java b/src/com/android/wallpaper/picker/SetWallpaperErrorDialogFragment.java
index be2f1e7..89a7d02 100755
--- a/src/com/android/wallpaper/picker/SetWallpaperErrorDialogFragment.java
+++ b/src/com/android/wallpaper/picker/SetWallpaperErrorDialogFragment.java

@@ -19,13 +19,14 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
 
 import com.android.wallpaper.R;
 import com.android.wallpaper.module.WallpaperPersister.Destination;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+
 /**
  * Dialog fragment which communicates a message that setting the wallpaper failed with an option to
  * try again.

diff --git a/src/com/android/wallpaper/picker/StandalonePreviewActivity.java b/src/com/android/wallpaper/picker/StandalonePreviewActivity.java
index b3ed13c..9eb07fc 100755
--- a/src/com/android/wallpaper/picker/StandalonePreviewActivity.java
+++ b/src/com/android/wallpaper/picker/StandalonePreviewActivity.java

@@ -21,9 +21,6 @@
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
 import android.util.Log;
 
 import com.android.wallpaper.R;
@@ -32,6 +29,10 @@
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.module.UserEventLogger;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 /**
  * Activity that displays a preview of a specific wallpaper and provides the ability to set the
  * wallpaper as the user's current wallpaper. It's "standalone" meaning it doesn't reside in the

diff --git a/src/com/android/wallpaper/picker/StartRotationDialogFragment.java b/src/com/android/wallpaper/picker/StartRotationDialogFragment.java
index 4e7b090..5f39690 100755
--- a/src/com/android/wallpaper/picker/StartRotationDialogFragment.java
+++ b/src/com/android/wallpaper/picker/StartRotationDialogFragment.java

@@ -19,10 +19,6 @@
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,6 +29,11 @@
 import com.android.wallpaper.model.WallpaperRotationInitializer;
 import com.android.wallpaper.module.InjectorProvider;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 /**
  * Dialog which allows user to start a wallpaper rotation or cancel, as well as providing an option
  * whether to rotate wallpapers on wifi-only connections or not.

diff --git a/src/com/android/wallpaper/picker/StartRotationErrorDialogFragment.java b/src/com/android/wallpaper/picker/StartRotationErrorDialogFragment.java
index 6fef3ae..9f98b70 100755
--- a/src/com/android/wallpaper/picker/StartRotationErrorDialogFragment.java
+++ b/src/com/android/wallpaper/picker/StartRotationErrorDialogFragment.java

@@ -18,13 +18,14 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
 
 import com.android.wallpaper.R;
 import com.android.wallpaper.model.WallpaperRotationInitializer.NetworkPreference;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 /**
  * Dialog fragment which communicates that starting a wallpaper rotation failed and gives the user
  * an option to retry starting the rotation.

diff --git a/src/com/android/wallpaper/picker/ToolbarFragment.java b/src/com/android/wallpaper/picker/ToolbarFragment.java
new file mode 100644
index 0000000..aa326a6
--- /dev/null
+++ b/src/com/android/wallpaper/picker/ToolbarFragment.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2018 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.wallpaper.picker;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.MenuRes;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
+import androidx.fragment.app.Fragment;
+
+import com.android.wallpaper.R;
+
+/**
+ * Base class for Fragments that own a {@link Toolbar} widget.
+ * A Fragment extending this class is expected to have a {@link Toolbar} in its root view, with id
+ * {@link R.id#toolbar}, which can optionally have a TextView with id custom_toolbar_title for
+ * the title.
+ * If the Bundle returned by {@link #createArguments(CharSequence)} is used as Arguments for this
+ * Fragment, the title provided to that method will be used as the Fragment's toolbar title,
+ * otherwise, the value returned by {@link #getDefaultTitle()} (default being {@code null}) will be
+ * used as title.
+ *
+ * @see #setArguments(Bundle)
+ */
+public abstract class ToolbarFragment extends Fragment implements OnMenuItemClickListener {
+
+    private static final String ARG_TITLE = "ToolbarFragment.title";
+
+    /**
+     * Returns a newly created {@link Bundle} containing the given title as an argument.
+     * If set as a ToolbarFragment's arguments bundle, this will be used to set up the title of
+     * the Toolbar in {@link #setUpToolbar(View)}
+     */
+    protected static Bundle createArguments(CharSequence title) {
+        Bundle args = new Bundle();
+        args.putCharSequence(ARG_TITLE, title);
+        return args;
+    }
+
+    protected Toolbar mToolbar;
+    private TextView mTitleView;
+
+    /**
+     * Configures a toolbar in the given rootView, with id {@code toolbar} and sets its title to
+     * the value in Arguments or {@link #getDefaultTitle()}
+     */
+    public void setUpToolbar(View rootView) {
+        mToolbar = rootView.findViewById(R.id.toolbar);
+
+        mTitleView = mToolbar.findViewById(R.id.custom_toolbar_title);
+        CharSequence title;
+        if (getArguments() != null) {
+            title = getArguments().getCharSequence(ARG_TITLE, getDefaultTitle());
+        } else {
+            title = getDefaultTitle();
+        }
+        if (!TextUtils.isEmpty(title)) {
+            setTitle(title);
+        }
+    }
+
+    /**
+     * Configures a toolbar in the given rootView, inflating the menu corresponding to the given id
+     * for the toolbar menu.
+     * Override {@link #onMenuItemClick(MenuItem)} to listen to item click events.
+     * @see #setUpToolbar(View)
+     */
+    public void setUpToolbar(View rootView, @MenuRes int menuResId) {
+        setUpToolbar(rootView);
+        mToolbar.inflateMenu(menuResId);
+        mToolbar.setOnMenuItemClickListener(this);
+    }
+
+    /**
+     * Provides a title for this Fragment's toolbar to be used if none is found in
+     * {@link #getArguments()}.
+     * Default implementation returns {@code null}.
+     */
+    public CharSequence getDefaultTitle() {
+        return null;
+    }
+
+    private void setTitle(CharSequence title) {
+        if (mToolbar == null) {
+            return;
+        }
+        if (mTitleView != null) {
+            mToolbar.setTitle(null);
+            mTitleView.setText(title);
+        } else {
+            mToolbar.setTitle(title);
+        }
+    }
+
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        return false;
+    }
+}

diff --git a/src/com/android/wallpaper/picker/TopLevelPickerActivity.java b/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
index 898a388..7e0da5e 100755
--- a/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
+++ b/src/com/android/wallpaper/picker/TopLevelPickerActivity.java

@@ -15,13 +15,10 @@
  */
 package com.android.wallpaper.picker;
 
-import android.Manifest.permission;
 import android.app.Activity;
 import android.app.ProgressDialog;
-import android.app.WallpaperManager;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.PorterDuff.Mode;
@@ -31,18 +28,6 @@
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.service.wallpaper.WallpaperService;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetBehavior.BottomSheetCallback;
-import android.support.design.widget.TabLayout;
-import android.support.design.widget.TabLayout.OnTabSelectedListener;
-import android.support.design.widget.TabLayout.Tab;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -52,28 +37,29 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 import com.android.wallpaper.R;
 import com.android.wallpaper.asset.Asset;
 import com.android.wallpaper.compat.ButtonDrawableSetterCompat;
-import com.android.wallpaper.compat.WallpaperManagerCompat;
 import com.android.wallpaper.config.Flags;
 import com.android.wallpaper.model.Category;
-import com.android.wallpaper.model.CategoryProvider;
-import com.android.wallpaper.model.CategoryReceiver;
 import com.android.wallpaper.model.ImageWallpaperInfo;
-import com.android.wallpaper.model.InlinePreviewIntentFactory;
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.module.CurrentWallpaperInfoFactory;
 import com.android.wallpaper.module.CurrentWallpaperInfoFactory.WallpaperInfoCallback;
 import com.android.wallpaper.module.DailyLoggingAlarmScheduler;
 import com.android.wallpaper.module.ExploreIntentChecker;
 import com.android.wallpaper.module.FormFactorChecker;
-import com.android.wallpaper.module.FormFactorChecker.FormFactor;
 import com.android.wallpaper.module.Injector;
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.module.NetworkStatusNotifier;
 import com.android.wallpaper.module.NetworkStatusNotifier.NetworkStatus;
-import com.android.wallpaper.module.PackageStatusNotifier;
 import com.android.wallpaper.module.UserEventLogger;
 import com.android.wallpaper.module.UserEventLogger.WallpaperSetFailureReason;
 import com.android.wallpaper.module.WallpaperPersister;
@@ -84,15 +70,18 @@
 import com.android.wallpaper.module.WallpaperPreferences.PresentationMode;
 import com.android.wallpaper.module.WallpaperRotationRefresher;
 import com.android.wallpaper.module.WallpaperRotationRefresher.Listener;
-import com.android.wallpaper.picker.PreviewActivity.PreviewActivityIntentFactory;
-import com.android.wallpaper.picker.ViewOnlyPreviewActivity.ViewOnlyPreviewActivityIntentFactory;
+import com.android.wallpaper.picker.CategoryFragment.CategoryFragmentHost;
 import com.android.wallpaper.picker.WallpaperDisabledFragment.WallpaperSupportLevel;
-import com.android.wallpaper.picker.individual.IndividualPickerActivity.IndividualPickerActivityIntentFactory;
 import com.android.wallpaper.picker.individual.IndividualPickerFragment;
 import com.android.wallpaper.util.ScreenSizeCalculator;
 import com.android.wallpaper.util.ThrowableAnalyzer;
 
-import java.util.ArrayList;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback;
+import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayout.OnTabSelectedListener;
+import com.google.android.material.tabs.TabLayout.Tab;
+
 import java.util.List;
 
 /**
@@ -100,11 +89,7 @@
  */
 public class TopLevelPickerActivity extends BaseActivity implements WallpapersUiContainer,
         CurrentWallpaperBottomSheetPresenter, SetWallpaperErrorDialogFragment.Listener,
-        MyPhotosLauncher {
-    private static final int SHOW_CATEGORY_REQUEST_CODE = 0;
-    private static final int PREVIEW_WALLPAPER_REQUEST_CODE = 1;
-    private static final int VIEW_ONLY_PREVIEW_WALLPAPER_REQUEST_CODE = 2;
-    private static final int READ_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE = 3;
+        MyPhotosStarter, CategoryFragmentHost {
 
     private static final String TAG_SET_WALLPAPER_ERROR_DIALOG_FRAGMENT =
             "toplevel_set_wallpaper_error_dialog";
@@ -112,17 +97,11 @@
     private static final String TAG = "TopLevelPicker";
     private static final String KEY_SELECTED_CATEGORY_TAB = "selected_category_tab";
 
-    private IndividualPickerActivityIntentFactory mPickerIntentFactory;
-    private InlinePreviewIntentFactory mPreviewIntentFactory;
-    private InlinePreviewIntentFactory mViewOnlyPreviewIntentFactory;
+    private WallpaperPickerDelegate mDelegate;
     private int mLastSelectedCategoryTabIndex;
-    @FormFactor
-    private int mFormFactor;
-    private WallpaperPreferences mPreferences;
     private UserEventLogger mUserEventLogger;
     private NetworkStatusNotifier mNetworkStatusNotifier;
     private NetworkStatusNotifier.Listener mNetworkStatusListener;
-    private PackageStatusNotifier mPackageStatusNotifier;
     private WallpaperPersister mWallpaperPersister;
     private boolean mWasCustomPhotoWallpaperSet;
     @WallpaperPosition
@@ -154,8 +133,6 @@
     private FrameLayout mLoadingIndicatorContainer;
     private LinearLayout mWallpaperPositionOptions;
 
-    private List<PermissionChangedListener> mPermissionChangedListeners;
-
     /**
      * Staged error dialog fragments that were unable to be shown when the activity didn't allow
      * committing fragment transactions.
@@ -167,9 +144,6 @@
      * retry or re-crop operations.
      */
     private WallpaperInfo mPendingSetWallpaperInfo;
-    private PackageStatusNotifier.Listener mLiveWallpaperStatusListener;
-    private PackageStatusNotifier.Listener mThirdPartyStatusListener;
-    private CategoryProvider mCategoryProvider;
 
     private static int getTextColorIdForWallpaperPositionButton(boolean isSelected) {
         return isSelected ? R.color.accent_color : R.color.material_grey500;
@@ -179,25 +153,16 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mPickerIntentFactory = new IndividualPickerActivityIntentFactory();
-        mPreviewIntentFactory = new PreviewActivityIntentFactory();
-        mViewOnlyPreviewIntentFactory = new ViewOnlyPreviewActivityIntentFactory();
         mLastSelectedCategoryTabIndex = -1;
 
         Injector injector = InjectorProvider.getInjector();
-        mCategoryProvider = injector.getCategoryProvider(this);
-        mPreferences = injector.getPreferences(this);
+        mDelegate = new WallpaperPickerDelegate(this, this, injector);
         mUserEventLogger = injector.getUserEventLogger(this);
         mNetworkStatusNotifier = injector.getNetworkStatusNotifier(this);
-        mPackageStatusNotifier = injector.getPackageStatusNotifier(this);
-        final FormFactorChecker formFactorChecker = injector.getFormFactorChecker(this);
-        mFormFactor = formFactorChecker.getFormFactor();
         mWallpaperPersister = injector.getWallpaperPersister(this);
         mWasCustomPhotoWallpaperSet = false;
 
-        mPermissionChangedListeners = new ArrayList<>();
-
-        @WallpaperSupportLevel int wallpaperSupportLevel = getWallpaperSupportLevel();
+        @WallpaperSupportLevel int wallpaperSupportLevel = mDelegate.getWallpaperSupportLevel();
         if (wallpaperSupportLevel != WallpaperDisabledFragment.SUPPORTED_CAN_SET) {
             setContentView(R.layout.activity_single_fragment);
 
@@ -210,7 +175,7 @@
             return;
         }
 
-        if (mFormFactor == FormFactorChecker.FORM_FACTOR_MOBILE) {
+        if (mDelegate.getFormFactor() == FormFactorChecker.FORM_FACTOR_MOBILE) {
             initializeMobile();
         } else { // DESKTOP
             initializeDesktop(savedInstanceState);
@@ -220,7 +185,7 @@
     @Override
     protected void onResume() {
         super.onResume();
-
+        mUserEventLogger.logResumed();
         // Show the staged 'load wallpaper' or 'set wallpaper' error dialog fragments if there is one
         // that was unable to be shown earlier when this fragment's hosting activity didn't allow
         // committing fragment transactions.
@@ -232,76 +197,46 @@
     }
 
     @Override
+    protected void onStop() {
+        mUserEventLogger.logStopped();
+        super.onStop();
+    }
+
+    @Override
     protected void onDestroy() {
         super.onDestroy();
-
+        mDelegate.cleanUp();
         if (mNetworkStatusListener != null) {
             mNetworkStatusNotifier.unregisterListener(mNetworkStatusListener);
         }
 
-        if (mPackageStatusNotifier != null) {
-            mPackageStatusNotifier.removeListener(mLiveWallpaperStatusListener);
-            mPackageStatusNotifier.removeListener(mThirdPartyStatusListener);
-        }
-
         if (mRefreshWallpaperProgressDialog != null) {
             mRefreshWallpaperProgressDialog.dismiss();
         }
         if (mSetWallpaperProgressDialog != null) {
             mSetWallpaperProgressDialog.dismiss();
         }
-
-        if (mFormFactor == FormFactorChecker.FORM_FACTOR_DESKTOP && mWasCustomPhotoWallpaperSet) {
-            mUserEventLogger.logWallpaperPosition(mCustomPhotoWallpaperPosition);
-        }
     }
 
     @Override
     public void requestCustomPhotoPicker(PermissionChangedListener listener) {
-        if (!isReadExternalStoragePermissionGranted()) {
-            PermissionChangedListener wrappedListener = new PermissionChangedListener() {
-                @Override
-                public void onPermissionsGranted() {
-                    listener.onPermissionsGranted();
-                    showCustomPhotoPicker();
-                }
-
-                @Override
-                public void onPermissionsDenied(boolean dontAskAgain) {
-                    listener.onPermissionsDenied(dontAskAgain);
-                }
-            };
-            requestExternalStoragePermission(wrappedListener);
-
-            return;
-        }
-
-        showCustomPhotoPicker();
+        mDelegate.requestCustomPhotoPicker(listener);
     }
 
-    void requestExternalStoragePermission(PermissionChangedListener listener) {
-        mPermissionChangedListeners.add(listener);
-        requestPermissions(
-                new String[]{permission.READ_EXTERNAL_STORAGE},
-                READ_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE);
+    @Override
+    public void requestExternalStoragePermission(PermissionChangedListener listener) {
+        mDelegate.requestExternalStoragePermission(listener);
     }
 
     /**
      * Returns whether READ_EXTERNAL_STORAGE has been granted for the application.
      */
-    boolean isReadExternalStoragePermissionGranted() {
-        return getPackageManager().checkPermission(permission.READ_EXTERNAL_STORAGE,
-                getPackageName()) == PackageManager.PERMISSION_GRANTED;
-    }
-
-    private void showCustomPhotoPicker() {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("image/*");
-        startActivityForResult(intent, SHOW_CATEGORY_REQUEST_CODE);
+    public boolean isReadExternalStoragePermissionGranted() {
+        return mDelegate.isReadExternalStoragePermissionGranted();
     }
 
     private void initializeMobile() {
-        setContentView(R.layout.activity_single_fragment_with_toolbar);
+        setContentView(R.layout.activity_single_fragment);
 
         // Set toolbar as the action bar.
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -316,7 +251,8 @@
             mUserEventLogger.logAppLaunched();
             DailyLoggingAlarmScheduler.setAlarm(getApplicationContext());
 
-            CategoryPickerFragment newFragment = new CategoryPickerFragment();
+            CategoryFragment newFragment = CategoryFragment.newInstance(
+                    getString(R.string.wallpaper_app_name));
             fm.beginTransaction()
                     .add(R.id.fragment_container, newFragment)
                     .commit();
@@ -324,98 +260,7 @@
             forceCategoryRefresh = true;
         }
 
-        populateCategories(-1, forceCategoryRefresh);
-        mLiveWallpaperStatusListener = this::updateLiveWallpapersCategories;
-        mThirdPartyStatusListener = this::updateThirdPartyCategories;
-        mPackageStatusNotifier.addListener(mLiveWallpaperStatusListener,
-                WallpaperService.SERVICE_INTERFACE);
-        mPackageStatusNotifier.addListener(mThirdPartyStatusListener,
-                Intent.ACTION_SET_WALLPAPER);
-    }
-
-    private void updateThirdPartyCategories(String packageName, @PackageStatusNotifier.PackageStatus
-            int status) {
-
-        if (status == PackageStatusNotifier.PackageStatus.ADDED) {
-            mCategoryProvider.fetchCategories(new CategoryReceiver() {
-                @Override
-                public void onCategoryReceived(Category category) {
-                    if (category.supportsThirdParty() && category.containsThirdParty(packageName)) {
-                        addCategory(category, false);
-                    }
-                }
-
-                @Override
-                public void doneFetchingCategories() {
-                    // Do nothing here.
-                }
-            }, true);
-        } else if (status == PackageStatusNotifier.PackageStatus.REMOVED) {
-            Category oldCategory = findThirdPartyCategory(packageName);
-            if (oldCategory != null) {
-                mCategoryProvider.fetchCategories(new CategoryReceiver() {
-                    @Override
-                    public void onCategoryReceived(Category category) {
-                       // Do nothing here
-                    }
-
-                    @Override
-                    public void doneFetchingCategories() {
-                        removeCategory(oldCategory);
-                    }
-                }, true);
-            }
-        } else {
-            // CHANGED package, let's reload all categories as we could have more or fewer now
-            populateCategories(-1, true);
-        }
-    }
-
-    private Category findThirdPartyCategory(String packageName) {
-        int size = mCategoryProvider.getSize();
-        for (int i = 0; i < size; i++) {
-            Category category = mCategoryProvider.getCategory(i);
-            if (category.supportsThirdParty() && category.containsThirdParty(packageName)) {
-                return category;
-            }
-        }
-        return null;
-    }
-
-    private void updateLiveWallpapersCategories(String packageName,
-                                                @PackageStatusNotifier.PackageStatus int status) {
-        String liveWallpaperCollectionId = getString(R.string.live_wallpaper_collection_id);
-        Category oldLiveWallpapersCategory = mCategoryProvider.getCategory(
-                liveWallpaperCollectionId);
-        if (status == PackageStatusNotifier.PackageStatus.REMOVED
-                && (oldLiveWallpapersCategory == null
-                    || !oldLiveWallpapersCategory.containsThirdParty(packageName))) {
-            // If we're removing a wallpaper and the live category didn't contain it already,
-            // there's nothing to do.
-            return;
-        }
-        mCategoryProvider.fetchCategories(new CategoryReceiver() {
-            @Override
-            public void onCategoryReceived(Category category) {
-                // Do nothing here
-            }
-
-            @Override
-            public void doneFetchingCategories() {
-                Category liveWallpapersCategory =
-                        mCategoryProvider.getCategory(liveWallpaperCollectionId);
-                if (liveWallpapersCategory == null) {
-                    // There are no more 3rd party live wallpapers, so the Category is gone.
-                    removeCategory(oldLiveWallpapersCategory);
-                } else {
-                    if (oldLiveWallpapersCategory != null) {
-                        updateCategory(liveWallpapersCategory);
-                    } else {
-                        addCategory(liveWallpapersCategory, false);
-                    }
-                }
-            }
-        }, true);
+        mDelegate.initialize(forceCategoryRefresh);
     }
 
     private void initializeDesktop(Bundle savedInstanceState) {
@@ -443,7 +288,7 @@
             @Override
             public void onTabSelected(Tab tab) {
                 Category category = (Category) tab.getTag();
-                show(category.getCollectionId());
+                showCategoryDesktop(category.getCollectionId());
                 mLastSelectedCategoryTabIndex = tabLayout.getSelectedTabPosition();
             }
 
@@ -505,9 +350,9 @@
                     .commit();
         }
 
-        int selectedTabPosition = savedInstanceState != null
+        mLastSelectedCategoryTabIndex = savedInstanceState != null
                 ? savedInstanceState.getInt(KEY_SELECTED_CATEGORY_TAB) : -1;
-        populateCategories(selectedTabPosition, forceCategoryRefresh);
+        mDelegate.populateCategories(forceCategoryRefresh);
 
         setDesktopLoading(true);
         setUpBottomSheet();
@@ -528,11 +373,11 @@
                 .add(R.id.fragment_container, newFragment)
                 .commit();
 
-        // Reset the last selected category tab index to ensure the app doesn't try to reselect a tab
-        // for a category not yet repopulated.
+        // Reset the last selected category tab index to ensure the app doesn't try to reselect a
+        // tab for a category not yet repopulated.
         mLastSelectedCategoryTabIndex = -1;
 
-        populateCategories(-1 /* selectedTabPosition */, true /* forceCategoryRefresh */);
+        mDelegate.populateCategories(true /* forceCategoryRefresh */);
 
         setDesktopLoading(false);
         setCurrentWallpapersExpanded(false);
@@ -603,7 +448,7 @@
                 } else {
                     alpha = 1f - slideOffset;
                 }
-                LinearLayout bottomSheetContents = (LinearLayout) findViewById(R.id.bottom_sheet_contents);
+                LinearLayout bottomSheetContents = findViewById(R.id.bottom_sheet_contents);
                 bottomSheetContents.setAlpha(alpha);
             }
         });
@@ -726,12 +571,8 @@
                         && presentationMode == WallpaperPreferences.PRESENTATION_MODE_ROTATING;
                 if (showSkipWallpaperButton) {
                     mCurrentWallpaperSkipWallpaperButton.setVisibility(View.VISIBLE);
-                    mCurrentWallpaperSkipWallpaperButton.setOnClickListener(new OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            refreshDailyWallpaper();
-                        }
-                    });
+                    mCurrentWallpaperSkipWallpaperButton.setOnClickListener(
+                            v -> refreshDailyWallpaper());
                 } else {
                     mCurrentWallpaperSkipWallpaperButton.setVisibility(View.GONE);
                 }
@@ -749,7 +590,8 @@
         if (formFactorChecker.getFormFactor() == FormFactorChecker.FORM_FACTOR_DESKTOP) {
             TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout);
 
-            // tabLayout is only present when the main IndividualPickerFragment is present (as opposed to
+            // tabLayout is only present when the main IndividualPickerFragment is present (as
+            // opposed to
             // the WallpaperDisabledFragment), so need this null check.
             if (tabLayout != null) {
                 savedInstanceState.putInt(KEY_SELECTED_CATEGORY_TAB, tabLayout.getSelectedTabPosition());
@@ -759,74 +601,14 @@
         super.onSaveInstanceState(savedInstanceState);
     }
 
-    /**
-     * Populates the categories appropriately depending on the device form factor.
-     *
-     * @param selectedTabPosition The position of the tab to show as selected, or -1 if no tab
-     *                            should be selected (i.e. because there is no tab layout present, as on MOBILE form factor).
-     * @param forceRefresh        Whether to force a refresh of categories from the CategoryProvider. True if
-     *                            on first launch.
-     */
-    private void populateCategories(final int selectedTabPosition, boolean forceRefresh) {
-
-        final CategoryPickerFragment categoryPickerFragment = getCategoryPickerFragment();
-
-        if (forceRefresh && categoryPickerFragment != null) {
-            categoryPickerFragment.clearCategories();
-        }
-
-        mCategoryProvider.fetchCategories(new CategoryReceiver() {
-            @Override
-            public void onCategoryReceived(Category category) {
-                addCategory(category, true);
-            }
-
-            @Override
-            public void doneFetchingCategories() {
-                if (mFormFactor == FormFactorChecker.FORM_FACTOR_MOBILE) {
-                    notifyDoneFetchingCategories();
-                } else { // DESKTOP
-                    populateCategoryTabs(selectedTabPosition);
-                }
-            }
-        }, forceRefresh);
-    }
-
-    private void notifyDoneFetchingCategories() {
-        CategoryPickerFragment categoryPickerFragment = getCategoryPickerFragment();
-        if (categoryPickerFragment != null) {
-            categoryPickerFragment.doneFetchingCategories();
-        }
-    }
-
-    private void addCategory(Category category, boolean fetchingAll) {
-        CategoryPickerFragment categoryPickerFragment = getCategoryPickerFragment();
-        if (categoryPickerFragment != null) {
-            categoryPickerFragment.addCategory(category, fetchingAll);
-        }
-    }
-
-    private void removeCategory(Category category) {
-        CategoryPickerFragment categoryPickerFragment = getCategoryPickerFragment();
-        if (categoryPickerFragment != null) {
-            categoryPickerFragment.removeCategory(category);
-        }
-    }
-
-    private void updateCategory(Category category) {
-        CategoryPickerFragment categoryPickerFragment = getCategoryPickerFragment();
-        if (categoryPickerFragment != null) {
-            categoryPickerFragment.updateCategory(category);
-        }
-    }
-
+    @Override
     @Nullable
-    private CategoryPickerFragment getCategoryPickerFragment() {
-        if (mFormFactor != FormFactorChecker.FORM_FACTOR_MOBILE) {
+    public CategoryFragment getCategoryFragment() {
+        if (mDelegate.getFormFactor() != FormFactorChecker.FORM_FACTOR_MOBILE) {
             return null;
         }
         FragmentManager fm = getSupportFragmentManager();
-        return (CategoryPickerFragment) fm.findFragmentById(R.id.fragment_container);
+        return (CategoryFragment) fm.findFragmentById(R.id.fragment_container);
     }
 
     /**
@@ -841,12 +623,12 @@
         final TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout);
         tabLayout.removeAllTabs();
 
-        String currentlySetCollectionId = mPreferences.getHomeWallpaperCollectionId();
+        String currentlySetCollectionId = mDelegate.getPreferences().getHomeWallpaperCollectionId();
 
         Tab tabToSelect = null;
         Tab firstEnumerableCategoryTab = null;
-        for (int i = 0; i < mCategoryProvider.getSize(); i++) {
-            Category category = mCategoryProvider.getCategory(i);
+        for (int i = 0; i < mDelegate.getCategoryProvider().getSize(); i++) {
+            Category category = mDelegate.getCategoryProvider().getCategory(i);
 
             Tab tab = tabLayout.newTab();
             tab.setText(category.getTitle());
@@ -938,24 +720,20 @@
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode == SHOW_CATEGORY_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
-            Uri imageUri = (data == null) ? null : data.getData();
-            if (imageUri != null) {
-                // User selected an image from the system picker, so launch the preview for that image.
-                ImageWallpaperInfo imageWallpaper = new ImageWallpaperInfo(imageUri);
-                if (mFormFactor == FormFactorChecker.FORM_FACTOR_DESKTOP) {
+        if (requestCode == WallpaperPickerDelegate.SHOW_CATEGORY_REQUEST_CODE
+                && resultCode == Activity.RESULT_OK) {
+            if (mDelegate.getFormFactor() == FormFactorChecker.FORM_FACTOR_DESKTOP) {
+                Uri imageUri = (data == null) ? null : data.getData();
+                if (imageUri != null) {
+                    // User selected an image from the system picker, so launch the preview for that
+                    // image.
+                    ImageWallpaperInfo imageWallpaper = new ImageWallpaperInfo(imageUri);
                     setCustomPhotoWallpaper(imageWallpaper);
                     return;
                 }
-
-                imageWallpaper.showPreview(this, mPreviewIntentFactory, PREVIEW_WALLPAPER_REQUEST_CODE);
-            } else {
-                // User finished viewing a category without any data, which implies that the user previewed
-                // and selected a wallpaper in-app, so finish this activity.
-                finishActivityWithResultOk();
             }
-        } else if (requestCode == PREVIEW_WALLPAPER_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
-            // User previewed and selected a wallpaper, so finish this activity.
+        }
+        if (mDelegate.handleActivityResult(requestCode, resultCode, data)) {
             finishActivityWithResultOk();
         }
     }
@@ -964,48 +742,21 @@
      * Shows the view-only preview activity for the given wallpaper.
      */
     public void showViewOnlyPreview(WallpaperInfo wallpaperInfo) {
-        wallpaperInfo.showPreview(
-                this, mViewOnlyPreviewIntentFactory, VIEW_ONLY_PREVIEW_WALLPAPER_REQUEST_CODE);
+        mDelegate.showViewOnlyPreview(wallpaperInfo);
     }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
                                            @NonNull int[] grantResults) {
-        if (requestCode == READ_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE
-                && permissions.length > 0
-                && permissions[0].equals(permission.READ_EXTERNAL_STORAGE)
-                && grantResults.length > 0) {
-            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                for (PermissionChangedListener listener : mPermissionChangedListeners) {
-                    listener.onPermissionsGranted();
-                }
-            } else if (!shouldShowRequestPermissionRationale(permission.READ_EXTERNAL_STORAGE)) {
-                for (PermissionChangedListener listener : mPermissionChangedListeners) {
-                    listener.onPermissionsDenied(true /* dontAskAgain */);
-                }
-            } else {
-                for (PermissionChangedListener listener : mPermissionChangedListeners) {
-                    listener.onPermissionsDenied(false /* dontAskAgain */);
-                }
-            }
-        }
-        mPermissionChangedListeners.clear();
+        mDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
     /**
      * Shows the picker activity for the given category.
      */
+    @Override
     public void show(String collectionId) {
-        Category category = findCategoryForCollectionId(collectionId);
-        if (category == null) {
-            return;
-        }
-
-        if (mFormFactor == FormFactorChecker.FORM_FACTOR_MOBILE) {
-            category.show(this, mPickerIntentFactory, SHOW_CATEGORY_REQUEST_CODE);
-        } else { // DESKTOP
-            showCategoryDesktop(collectionId);
-        }
+        mDelegate.show(collectionId);
     }
 
     private void reselectLastTab() {
@@ -1014,20 +765,16 @@
         // In the offline case, "My photos" could be the only category. Thus we need this check --
         // to ensure that we don't try to select the "previously selected" category which was -1.
         if (mLastSelectedCategoryTabIndex > -1) {
-            Tab tabToSelect = tabLayout.getTabAt(mLastSelectedCategoryTabIndex);
+            Tab tabToSelect = tabLayout.getTabAt(
+                    mLastSelectedCategoryTabIndex);
             if (((Category) tabToSelect.getTag()).isEnumerable()) {
                 tabToSelect.select();
             }
         }
     }
 
-    @Nullable
-    private Category findCategoryForCollectionId(String collectionId) {
-        return mCategoryProvider.getCategory(collectionId);
-    }
-
     private void showCategoryDesktop(String collectionId) {
-        Category category = findCategoryForCollectionId(collectionId);
+        Category category = mDelegate.findCategoryForCollectionId(collectionId);
         if (category == null) {
             return;
         }
@@ -1041,14 +788,17 @@
                         .remove(fragment)
                         .commit();
             }
-            IndividualPickerFragment newFragment = IndividualPickerFragment.newInstance(collectionId);
+            Injector injector = InjectorProvider.getInjector();
+            IndividualPickerFragment newFragment = injector.getIndividualPickerFragment(
+                    collectionId);
             fm.beginTransaction()
                     .add(R.id.fragment_container, newFragment)
                     .commit();
             newFragment.setCurrentWallpaperBottomSheetPresenter(this);
             newFragment.setWallpapersUiContainer(this);
         } else {
-            category.show(this, mPickerIntentFactory, SHOW_CATEGORY_REQUEST_CODE);
+            category.show(this, mDelegate.getPickerIntentFactory(),
+                    WallpaperPickerDelegate.SHOW_CATEGORY_REQUEST_CODE);
 
             // Need to select the tab here in case we are coming back from a "My photos" in which case
             // the tab would have been set to "My photos" while viewing a regular image category.
@@ -1062,36 +812,18 @@
         finish();
     }
 
-    @WallpaperSupportLevel
-    private int getWallpaperSupportLevel() {
-        WallpaperManager wallpaperManager = WallpaperManager.getInstance(this);
-
-        if (VERSION.SDK_INT >= VERSION_CODES.N) {
-            if (wallpaperManager.isWallpaperSupported()) {
-                return wallpaperManager.isSetWallpaperAllowed()
-                        ? WallpaperDisabledFragment.SUPPORTED_CAN_SET
-                        : WallpaperDisabledFragment.NOT_SUPPORTED_BLOCKED_BY_ADMIN;
-            }
-            return WallpaperDisabledFragment.NOT_SUPPORTED_BY_DEVICE;
-        } else if (VERSION.SDK_INT >= VERSION_CODES.M) {
-            return wallpaperManager.isWallpaperSupported() ? WallpaperDisabledFragment.SUPPORTED_CAN_SET
-                    : WallpaperDisabledFragment.NOT_SUPPORTED_BY_DEVICE;
-        } else {
-            WallpaperManagerCompat wallpaperManagerCompat =
-                    InjectorProvider.getInjector().getWallpaperManagerCompat(this);
-            boolean isSupported = wallpaperManagerCompat.getDrawable() != null;
-            wallpaperManager.forgetLoadedWallpaper();
-            return isSupported ? WallpaperDisabledFragment.SUPPORTED_CAN_SET
-                    : WallpaperDisabledFragment.NOT_SUPPORTED_BY_DEVICE;
-        }
-    }
-
     @Override
     public void setCurrentWallpapersExpanded(boolean expanded) {
         final BottomSheetBehavior<LinearLayout> bottomSheetBehavior =
                 BottomSheetBehavior.from(mBottomSheet);
         bottomSheetBehavior.setState(
-                expanded ? BottomSheetBehavior.STATE_EXPANDED : BottomSheetBehavior.STATE_COLLAPSED);
+                expanded ? BottomSheetBehavior.STATE_EXPANDED
+                        : BottomSheetBehavior.STATE_COLLAPSED);
+    }
+
+    @Override
+    public void doneFetchingCategories() {
+        populateCategoryTabs(mLastSelectedCategoryTabIndex);
     }
 
     @Override
@@ -1101,6 +833,11 @@
     }
 
     @Override
+    public MyPhotosStarter getMyPhotosStarter() {
+        return this;
+    }
+
+    @Override
     public void onClickTryAgain(@Destination int unused) {
         // Retry the set wallpaper operation with the default center-crop setting.
         if (mPendingSetWallpaperInfo != null) {
@@ -1125,7 +862,7 @@
                         dismissSettingWallpaperProgressDialog();
                         refreshCurrentWallpapers(null /* refreshListener */);
 
-                        mPreferences.setPendingWallpaperSetStatus(
+                        mDelegate.getPreferences().setPendingWallpaperSetStatus(
                                 WallpaperPreferences.WALLPAPER_SET_NOT_PENDING);
                         mUserEventLogger.logWallpaperSet(
                                 wallpaper.getCollectionId(getApplicationContext()),
@@ -1151,7 +888,7 @@
                         dismissSettingWallpaperProgressDialog();
                         showSetWallpaperErrorDialog();
 
-                        mPreferences.setPendingWallpaperSetStatus(
+                        mDelegate.getPreferences().setPendingWallpaperSetStatus(
                                 WallpaperPreferences.WALLPAPER_SET_NOT_PENDING);
                         mUserEventLogger.logWallpaperSetResult(
                                 UserEventLogger.WALLPAPER_SET_RESULT_FAILURE);
@@ -1295,8 +1032,8 @@
     }
 
     private void showSettingWallpaperProgressDialog() {
-        // ProgressDialog endlessly updates the UI thread, keeping it from going idle which therefore
-        // causes Espresso to hang once the dialog is shown.
+        // ProgressDialog endlessly updates the UI thread, keeping it from going idle which
+        // therefore causes Espresso to hang once the dialog is shown.
         if (!mTestingMode) {
             int themeResId;
             if (VERSION.SDK_INT < VERSION_CODES.LOLLIPOP) {

diff --git a/src/com/android/wallpaper/picker/ViewOnlyPreviewActivity.java b/src/com/android/wallpaper/picker/ViewOnlyPreviewActivity.java
index 922b7fc..2a22046 100755
--- a/src/com/android/wallpaper/picker/ViewOnlyPreviewActivity.java
+++ b/src/com/android/wallpaper/picker/ViewOnlyPreviewActivity.java

@@ -18,14 +18,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
 
 import com.android.wallpaper.R;
 import com.android.wallpaper.model.InlinePreviewIntentFactory;
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.module.InjectorProvider;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 /**
  * Activity that displays a view-only preview of a specific wallpaper.
  */

diff --git a/src/com/android/wallpaper/picker/WallpaperDisabledFragment.java b/src/com/android/wallpaper/picker/WallpaperDisabledFragment.java
index 18745c8..0bd5f35 100755
--- a/src/com/android/wallpaper/picker/WallpaperDisabledFragment.java
+++ b/src/com/android/wallpaper/picker/WallpaperDisabledFragment.java

@@ -16,8 +16,6 @@
 package com.android.wallpaper.picker;
 
 import android.os.Bundle;
-import android.support.annotation.IntDef;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,6 +29,9 @@
 
 import java.util.Date;
 
+import androidx.annotation.IntDef;
+import androidx.fragment.app.Fragment;
+
 /**
  * Displays the UI indicating that setting wallpaper is disabled.
  */

diff --git a/src/com/android/wallpaper/picker/WallpaperPickerDelegate.java b/src/com/android/wallpaper/picker/WallpaperPickerDelegate.java
new file mode 100644
index 0000000..18a7c2c
--- /dev/null
+++ b/src/com/android/wallpaper/picker/WallpaperPickerDelegate.java

@@ -0,0 +1,453 @@
+/*
+ * Copyright (C) 2018 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.wallpaper.picker;
+
+import android.Manifest.permission;
+import android.app.Activity;
+import android.app.WallpaperManager;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.service.wallpaper.WallpaperService;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.os.BuildCompat;
+import androidx.fragment.app.FragmentActivity;
+
+import com.android.wallpaper.R;
+import com.android.wallpaper.compat.WallpaperManagerCompat;
+import com.android.wallpaper.model.Category;
+import com.android.wallpaper.model.CategoryProvider;
+import com.android.wallpaper.model.CategoryReceiver;
+import com.android.wallpaper.model.ImageWallpaperInfo;
+import com.android.wallpaper.model.InlinePreviewIntentFactory;
+import com.android.wallpaper.model.WallpaperInfo;
+import com.android.wallpaper.module.FormFactorChecker;
+import com.android.wallpaper.module.FormFactorChecker.FormFactor;
+import com.android.wallpaper.module.Injector;
+import com.android.wallpaper.module.InjectorProvider;
+import com.android.wallpaper.module.PackageStatusNotifier;
+import com.android.wallpaper.module.PackageStatusNotifier.PackageStatus;
+import com.android.wallpaper.module.WallpaperPreferences;
+import com.android.wallpaper.picker.PreviewActivity.PreviewActivityIntentFactory;
+import com.android.wallpaper.picker.ViewOnlyPreviewActivity.ViewOnlyPreviewActivityIntentFactory;
+import com.android.wallpaper.picker.WallpaperDisabledFragment.WallpaperSupportLevel;
+import com.android.wallpaper.picker.individual.IndividualPickerActivity.IndividualPickerActivityIntentFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Implements all the logic for handling a WallpaperPicker container Activity.
+ * @see TopLevelPickerActivity for usage details.
+ */
+public class WallpaperPickerDelegate implements MyPhotosStarter {
+
+    private final FragmentActivity mActivity;
+    private final WallpapersUiContainer mContainer;
+    static final int SHOW_CATEGORY_REQUEST_CODE = 0;
+    static final int PREVIEW_WALLPAPER_REQUEST_CODE = 1;
+    static final int VIEW_ONLY_PREVIEW_WALLPAPER_REQUEST_CODE = 2;
+    static final int READ_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE = 3;
+
+    private IndividualPickerActivityIntentFactory mPickerIntentFactory;
+
+    private InlinePreviewIntentFactory mPreviewIntentFactory;
+    private InlinePreviewIntentFactory mViewOnlyPreviewIntentFactory;
+
+    @FormFactor private int mFormFactor;
+    private WallpaperPreferences mPreferences;
+    private PackageStatusNotifier mPackageStatusNotifier;
+
+    private List<PermissionChangedListener> mPermissionChangedListeners;
+    private PackageStatusNotifier.Listener mLiveWallpaperStatusListener;
+    private PackageStatusNotifier.Listener mThirdPartyStatusListener;
+    private CategoryProvider mCategoryProvider;
+    private static final String READ_PERMISSION = permission.READ_EXTERNAL_STORAGE;
+
+    public WallpaperPickerDelegate(WallpapersUiContainer container, FragmentActivity activity,
+            Injector injector) {
+        mContainer = container;
+        mActivity = activity;
+        mPickerIntentFactory = new IndividualPickerActivityIntentFactory();
+        mPreviewIntentFactory = new PreviewActivityIntentFactory();
+        mViewOnlyPreviewIntentFactory =
+                new ViewOnlyPreviewActivityIntentFactory();
+
+        mCategoryProvider = injector.getCategoryProvider(activity);
+        mPreferences = injector.getPreferences(activity);
+
+        mPackageStatusNotifier = injector.getPackageStatusNotifier(activity);
+        final FormFactorChecker formFactorChecker = injector.getFormFactorChecker(activity);
+        mFormFactor = formFactorChecker.getFormFactor();
+
+        mPermissionChangedListeners = new ArrayList<>();
+    }
+
+    public void initialize(boolean forceCategoryRefresh) {
+        populateCategories(forceCategoryRefresh);
+        mLiveWallpaperStatusListener = this::updateLiveWallpapersCategories;
+        mThirdPartyStatusListener = this::updateThirdPartyCategories;
+        mPackageStatusNotifier.addListener(
+                mLiveWallpaperStatusListener,
+                WallpaperService.SERVICE_INTERFACE);
+        mPackageStatusNotifier.addListener(mThirdPartyStatusListener, Intent.ACTION_SET_WALLPAPER);
+    }
+
+    @Override
+    public void requestCustomPhotoPicker(PermissionChangedListener listener) {
+        if (!isReadExternalStoragePermissionGranted()) {
+            PermissionChangedListener wrappedListener = new PermissionChangedListener() {
+                @Override
+                public void onPermissionsGranted() {
+                    listener.onPermissionsGranted();
+                    showCustomPhotoPicker();
+                }
+
+                @Override
+                public void onPermissionsDenied(boolean dontAskAgain) {
+                    listener.onPermissionsDenied(dontAskAgain);
+                }
+            };
+            requestExternalStoragePermission(wrappedListener);
+
+            return;
+        }
+
+        showCustomPhotoPicker();
+    }
+
+    /**
+     * Requests to show the Android custom photo picker for the sake of picking a
+     * photo to set as the device's wallpaper.
+     */
+    public void requestExternalStoragePermission(PermissionChangedListener listener) {
+        mPermissionChangedListeners.add(listener);
+        mActivity.requestPermissions(
+                new String[]{READ_PERMISSION},
+                READ_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE);
+    }
+
+    /**
+     * Returns whether READ_EXTERNAL_STORAGE has been granted for the application.
+     */
+    public boolean isReadExternalStoragePermissionGranted() {
+        return mActivity.getPackageManager().checkPermission(
+                permission.READ_EXTERNAL_STORAGE,
+                mActivity.getPackageName()) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void showCustomPhotoPicker() {
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.setType("image/*");
+        mActivity.startActivityForResult(intent, SHOW_CATEGORY_REQUEST_CODE);
+    }
+
+    private void updateThirdPartyCategories(String packageName, @PackageStatus int status) {
+        if (status == PackageStatus.ADDED) {
+            mCategoryProvider.fetchCategories(new CategoryReceiver() {
+                @Override
+                public void onCategoryReceived(Category category) {
+                    if (category.supportsThirdParty() && category.containsThirdParty(packageName)) {
+                        addCategory(category, false);
+                    }
+                }
+
+                @Override
+                public void doneFetchingCategories() {
+                    // Do nothing here.
+                }
+            }, true);
+        } else if (status == PackageStatus.REMOVED) {
+            Category oldCategory = findThirdPartyCategory(packageName);
+            if (oldCategory != null) {
+                mCategoryProvider.fetchCategories(new CategoryReceiver() {
+                    @Override
+                    public void onCategoryReceived(Category category) {
+                        // Do nothing here
+                    }
+
+                    @Override
+                    public void doneFetchingCategories() {
+                        removeCategory(oldCategory);
+                    }
+                }, true);
+            }
+        } else {
+            // CHANGED package, let's reload all categories as we could have more or fewer now
+            populateCategories(true);
+        }
+    }
+
+    private Category findThirdPartyCategory(String packageName) {
+        int size = mCategoryProvider.getSize();
+        for (int i = 0; i < size; i++) {
+            Category category = mCategoryProvider.getCategory(i);
+            if (category.supportsThirdParty() && category.containsThirdParty(packageName)) {
+                return category;
+            }
+        }
+        return null;
+    }
+
+    private void updateLiveWallpapersCategories(String packageName,
+            @PackageStatus int status) {
+        String liveWallpaperCollectionId = mActivity.getString(
+                R.string.live_wallpaper_collection_id);
+        Category oldLiveWallpapersCategory = mCategoryProvider.getCategory(
+                liveWallpaperCollectionId);
+        if (status == PackageStatus.REMOVED
+                && (oldLiveWallpapersCategory == null
+                || !oldLiveWallpapersCategory.containsThirdParty(packageName))) {
+            // If we're removing a wallpaper and the live category didn't contain it already,
+            // there's nothing to do.
+            return;
+        }
+        mCategoryProvider.fetchCategories(new CategoryReceiver() {
+            @Override
+            public void onCategoryReceived(Category category) {
+                // Do nothing here
+            }
+
+            @Override
+            public void doneFetchingCategories() {
+                Category liveWallpapersCategory =
+                        mCategoryProvider.getCategory(liveWallpaperCollectionId);
+                if (liveWallpapersCategory == null) {
+                    // There are no more 3rd party live wallpapers, so the Category is gone.
+                    removeCategory(oldLiveWallpapersCategory);
+                } else {
+                    if (oldLiveWallpapersCategory != null) {
+                        updateCategory(liveWallpapersCategory);
+                    } else {
+                        addCategory(liveWallpapersCategory, false);
+                    }
+                }
+            }
+        }, true);
+    }
+
+    /**
+     * Populates the categories appropriately depending on the device form factor.
+     *
+     * @param forceRefresh        Whether to force a refresh of categories from the
+     *                            CategoryProvider. True if
+     *                            on first launch.
+     */
+    public void populateCategories(boolean forceRefresh) {
+
+        final CategoryFragment categoryFragment = getCategoryPickerFragment();
+
+        if (forceRefresh && categoryFragment != null) {
+            categoryFragment.clearCategories();
+        }
+
+        mCategoryProvider.fetchCategories(new CategoryReceiver() {
+            @Override
+            public void onCategoryReceived(Category category) {
+                addCategory(category, true);
+            }
+
+            @Override
+            public void doneFetchingCategories() {
+                notifyDoneFetchingCategories();
+            }
+        }, forceRefresh);
+    }
+
+    private void notifyDoneFetchingCategories() {
+        if (mFormFactor == FormFactorChecker.FORM_FACTOR_MOBILE) {
+            CategoryFragment categoryFragment = getCategoryPickerFragment();
+            if (categoryFragment != null) {
+                categoryFragment.doneFetchingCategories();
+            }
+        } else {
+            mContainer.doneFetchingCategories();
+        }
+    }
+
+    public void addCategory(Category category, boolean fetchingAll) {
+        CategoryFragment categoryFragment = getCategoryPickerFragment();
+        if (categoryFragment != null) {
+            categoryFragment.addCategory(category, fetchingAll);
+        }
+    }
+
+    public void removeCategory(Category category) {
+        CategoryFragment categoryFragment = getCategoryPickerFragment();
+        if (categoryFragment != null) {
+            categoryFragment.removeCategory(category);
+        }
+    }
+
+    public void updateCategory(Category category) {
+        CategoryFragment categoryFragment = getCategoryPickerFragment();
+        if (categoryFragment != null) {
+            categoryFragment.updateCategory(category);
+        }
+    }
+
+    @Nullable
+    private CategoryFragment getCategoryPickerFragment() {
+        return mContainer.getCategoryFragment();
+    }
+
+    /**
+     * Shows the view-only preview activity for the given wallpaper.
+     */
+    public void showViewOnlyPreview(WallpaperInfo wallpaperInfo) {
+        wallpaperInfo.showPreview(
+                mActivity, mViewOnlyPreviewIntentFactory,
+                VIEW_ONLY_PREVIEW_WALLPAPER_REQUEST_CODE);
+    }
+
+    /**
+     * Shows the picker activity for the given category.
+     */
+    public void show(String collectionId) {
+        Category category = findCategoryForCollectionId(collectionId);
+        if (category == null) {
+            return;
+        }
+        category.show(mActivity, mPickerIntentFactory, SHOW_CATEGORY_REQUEST_CODE);
+    }
+
+    @Nullable
+    public Category findCategoryForCollectionId(String collectionId) {
+        return mCategoryProvider.getCategory(collectionId);
+    }
+
+    @WallpaperSupportLevel
+    public int getWallpaperSupportLevel() {
+        WallpaperManager wallpaperManager = WallpaperManager.getInstance(mActivity);
+
+        if (VERSION.SDK_INT >= VERSION_CODES.N) {
+            if (wallpaperManager.isWallpaperSupported()) {
+                return wallpaperManager.isSetWallpaperAllowed()
+                        ? WallpaperDisabledFragment.SUPPORTED_CAN_SET
+                        : WallpaperDisabledFragment.NOT_SUPPORTED_BLOCKED_BY_ADMIN;
+            }
+            return WallpaperDisabledFragment.NOT_SUPPORTED_BY_DEVICE;
+        } else if (VERSION.SDK_INT >= VERSION_CODES.M) {
+            return wallpaperManager.isWallpaperSupported()
+                    ? WallpaperDisabledFragment.SUPPORTED_CAN_SET
+                    : WallpaperDisabledFragment.NOT_SUPPORTED_BY_DEVICE;
+        } else {
+            WallpaperManagerCompat wallpaperManagerCompat =
+                    InjectorProvider.getInjector().getWallpaperManagerCompat(
+                            mActivity);
+            boolean isSupported = wallpaperManagerCompat.getDrawable() != null;
+            wallpaperManager.forgetLoadedWallpaper();
+            return isSupported ? WallpaperDisabledFragment.SUPPORTED_CAN_SET
+                    : WallpaperDisabledFragment.NOT_SUPPORTED_BY_DEVICE;
+        }
+    }
+
+    public IndividualPickerActivityIntentFactory getPickerIntentFactory() {
+        return mPickerIntentFactory;
+    }
+
+    public InlinePreviewIntentFactory getPreviewIntentFactory() {
+        return mPreviewIntentFactory;
+    }
+
+    @FormFactor
+    public int getFormFactor() {
+        return mFormFactor;
+    }
+
+    public WallpaperPreferences getPreferences() {
+        return mPreferences;
+    }
+
+    public List<PermissionChangedListener> getPermissionChangedListeners() {
+        return mPermissionChangedListeners;
+    }
+
+    public CategoryProvider getCategoryProvider() {
+        return mCategoryProvider;
+    }
+
+    /**
+     * Call when the owner activity is destroyed to clean up listeners.
+     */
+    public void cleanUp() {
+        if (mPackageStatusNotifier != null) {
+            mPackageStatusNotifier.removeListener(mLiveWallpaperStatusListener);
+            mPackageStatusNotifier.removeListener(mThirdPartyStatusListener);
+        }
+    }
+
+    /**
+     * Call from the Activity's onRequestPermissionsResult callback to handle permission request
+     * relevant to wallpapers (ie, READ_EXTERNAL_STORAGE)
+     * @see androidx.fragment.app.FragmentActivity#onRequestPermissionsResult(int, String[], int[])
+     */
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+            @NonNull int[] grantResults) {
+        if (requestCode == WallpaperPickerDelegate.READ_EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE
+                && permissions.length > 0
+                && permissions[0].equals(READ_PERMISSION)
+                && grantResults.length > 0) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                for (PermissionChangedListener listener : getPermissionChangedListeners()) {
+                    listener.onPermissionsGranted();
+                }
+            } else if (!mActivity.shouldShowRequestPermissionRationale(READ_PERMISSION)) {
+                for (PermissionChangedListener listener : getPermissionChangedListeners()) {
+                    listener.onPermissionsDenied(true /* dontAskAgain */);
+                }
+            } else {
+                for (PermissionChangedListener listener :getPermissionChangedListeners()) {
+                    listener.onPermissionsDenied(false /* dontAskAgain */);
+                }
+            }
+        }
+       getPermissionChangedListeners().clear();
+    }
+
+    /**
+     * To be called from an Activity's onActivityResult method.
+     * Checks the result for ones that are handled by this delegate
+     * @return true if the intent was handled and calling Activity needs to finish with result
+     * OK, false otherwise.
+     */
+    public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == SHOW_CATEGORY_REQUEST_CODE  && resultCode == Activity.RESULT_OK) {
+            Uri imageUri = (data == null) ? null : data.getData();
+            if (imageUri != null) {
+                // User selected an image from the system picker, so launch the preview for that
+                // image.
+                ImageWallpaperInfo imageWallpaper = new ImageWallpaperInfo(imageUri);
+
+                imageWallpaper.showPreview(mActivity, getPreviewIntentFactory(),
+                        PREVIEW_WALLPAPER_REQUEST_CODE);
+            } else {
+                // User finished viewing a category without any data, which implies that the user
+                // previewed and selected a wallpaper in-app, so finish this activity.
+                return true;
+            }
+        } else if (requestCode == PREVIEW_WALLPAPER_REQUEST_CODE
+                && resultCode == Activity.RESULT_OK) {
+            // User previewed and selected a wallpaper, so finish this activity.
+            return true;
+        }
+        return false;
+    }
+}

diff --git a/src/com/android/wallpaper/picker/WallpaperPreviewBitmapTransformation.java b/src/com/android/wallpaper/picker/WallpaperPreviewBitmapTransformation.java
index cc51265..0ee04a6 100755
--- a/src/com/android/wallpaper/picker/WallpaperPreviewBitmapTransformation.java
+++ b/src/com/android/wallpaper/picker/WallpaperPreviewBitmapTransformation.java

@@ -18,16 +18,18 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Point;
-import android.support.annotation.NonNull;
 import android.view.WindowManager;
 
 import com.android.wallpaper.util.ScreenSizeCalculator;
 import com.android.wallpaper.util.WallpaperCropUtils;
+
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
 
 import java.security.MessageDigest;
 
+import androidx.annotation.NonNull;
+
 /**
  * Glide bitmap transformation which emulates the default preview positioning of a wallpaper image.
  */

diff --git a/src/com/android/wallpaper/picker/WallpapersUiContainer.java b/src/com/android/wallpaper/picker/WallpapersUiContainer.java
index 8bde730..724c107 100755
--- a/src/com/android/wallpaper/picker/WallpapersUiContainer.java
+++ b/src/com/android/wallpaper/picker/WallpapersUiContainer.java

@@ -15,6 +15,8 @@
  */
 package com.android.wallpaper.picker;
 
+import androidx.annotation.Nullable;
+
 /**
  * Interface for a class which presents (in UI) a collection of wallpapers.
  */
@@ -23,4 +25,16 @@
      * Notifies the container that wallpapers are ready to display.
      */
     void onWallpapersReady();
+
+    /**
+     * Returns the {@link CategoryFragment} used by this container to display wallpaper
+     * categories, or {@code null} if none is available.
+     */
+    @Nullable
+    CategoryFragment getCategoryFragment();
+
+    /**
+     * Notifies the container that categories have been fetched.
+     */
+    void doneFetchingCategories();
 }

diff --git a/src/com/android/wallpaper/picker/individual/DesktopRotationHolder.java b/src/com/android/wallpaper/picker/individual/DesktopRotationHolder.java
index d74554c..d2ab519 100755
--- a/src/com/android/wallpaper/picker/individual/DesktopRotationHolder.java
+++ b/src/com/android/wallpaper/picker/individual/DesktopRotationHolder.java

@@ -16,7 +16,6 @@
 package com.android.wallpaper.picker.individual;
 
 import android.app.Activity;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.View;
 import android.widget.ImageView;
 
@@ -28,6 +27,8 @@
 import com.android.wallpaper.module.WallpaperPreferences;
 import com.android.wallpaper.picker.RotationStarter;
 
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 /**
  * IndividualHolder subclass for a wallpaper tile in the RecyclerView for which a click should
  * set the wallpaper as the current wallpaper on the device.

diff --git a/src/com/android/wallpaper/picker/individual/IndividualHolder.java b/src/com/android/wallpaper/picker/individual/IndividualHolder.java
index a8f9267..5ef61c3 100755
--- a/src/com/android/wallpaper/picker/individual/IndividualHolder.java
+++ b/src/com/android/wallpaper/picker/individual/IndividualHolder.java

@@ -17,7 +17,6 @@
 
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -28,6 +27,8 @@
 
 import java.util.List;
 
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 /**
  * Base class for ViewHolders for individual wallpaper tiles.
  */

diff --git a/src/com/android/wallpaper/picker/individual/IndividualPickerActivity.java b/src/com/android/wallpaper/picker/individual/IndividualPickerActivity.java
index 50248a6..2d77608 100755
--- a/src/com/android/wallpaper/picker/individual/IndividualPickerActivity.java
+++ b/src/com/android/wallpaper/picker/individual/IndividualPickerActivity.java

@@ -25,14 +25,15 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 import com.android.wallpaper.R;
 import com.android.wallpaper.compat.BuildCompat;
 import com.android.wallpaper.model.Category;
@@ -94,6 +95,7 @@
             // saved state, or with a collection id that doesn't exist anymore.
             // In those cases, we cannot continue, so let's just go back.
             finish();
+            return;
         }
 
         setTitle(mCategory.getTitle());
@@ -121,7 +123,7 @@
         }
 
         if (fragment == null) {
-            fragment = IndividualPickerFragment.newInstance(mCategoryCollectionId);
+            fragment = injector.getIndividualPickerFragment(mCategoryCollectionId);
             fm.beginTransaction()
                     .add(R.id.fragment_container, fragment)
                     .commit();

diff --git a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
index 32d58e7..bd0c39d 100755
--- a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
+++ b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java

@@ -26,12 +26,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.service.wallpaper.WallpaperService;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.OnScrollListener;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -41,6 +35,13 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 import com.android.wallpaper.R;
 import com.android.wallpaper.asset.Asset;
 import com.android.wallpaper.asset.Asset.DrawableLoadedListener;
@@ -65,6 +66,7 @@
 import com.android.wallpaper.module.WallpaperPreferences;
 import com.android.wallpaper.picker.BaseActivity;
 import com.android.wallpaper.picker.CurrentWallpaperBottomSheetPresenter;
+import com.android.wallpaper.picker.MyPhotosStarter.MyPhotosStarterProvider;
 import com.android.wallpaper.picker.RotationStarter;
 import com.android.wallpaper.picker.SetWallpaperErrorDialogFragment;
 import com.android.wallpaper.picker.StartRotationDialogFragment;
@@ -74,6 +76,7 @@
 import com.android.wallpaper.util.DiskBasedLogger;
 import com.android.wallpaper.util.TileSizeCalculator;
 import com.android.wallpaper.widget.GridMarginDecoration;
+
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.MemoryCategory;
 
@@ -89,8 +92,14 @@
         implements RotationStarter, StartRotationErrorDialogFragment.Listener,
         CurrentWallpaperBottomSheetPresenter.RefreshListener,
         SetWallpaperErrorDialogFragment.Listener {
+    /**
+     * Position of a special tile that doesn't belong to an individual wallpaper of the category,
+     * such as "my photos" or "daily rotation".
+     */
+    static final int SPECIAL_FIXED_TILE_ADAPTER_POSITION = 0;
+    static final String ARG_CATEGORY_COLLECTION_ID = "category_collection_id";
+
     private static final String TAG = "IndividualPickerFrgmnt";
-    private static final String ARG_CATEGORY_COLLECTION_ID = "category_collection_id";
     private static final int UNUSED_REQUEST_CODE = 1;
     private static final String TAG_START_ROTATION_DIALOG = "start_rotation_dialog";
     private static final String TAG_START_ROTATION_ERROR_DIALOG = "start_rotation_error_dialog";
@@ -99,29 +108,51 @@
     private static final String TAG_SET_WALLPAPER_ERROR_DIALOG_FRAGMENT =
             "individual_set_wallpaper_error_dialog";
 
-    /**
-     * Position of a special tile that doesn't belong to an individual wallpaper of the category,
-     * such as "my photos" or "daily rotation".
-     */
-    private static final int SPECIAL_FIXED_TILE_ADAPTER_POSITION = 0;
+    WallpaperPreferences mWallpaperPreferences;
+    WallpaperChangedNotifier mWallpaperChangedNotifier;
+    RotatingWallpaperComponentChecker mRotatingWallpaperComponentChecker;
+    RecyclerView mImageGrid;
+    IndividualAdapter mAdapter;
+    WallpaperCategory mCategory;
+    WallpaperRotationInitializer mWallpaperRotationInitializer;
+    List<WallpaperInfo> mWallpapers;
+    Point mTileSizePx;
+    WallpapersUiContainer mWallpapersUiContainer;
+    @FormFactor
+    int mFormFactor;
+    PackageStatusNotifier mPackageStatusNotifier;
 
-    private WallpaperPreferences mWallpaperPreferences;
-    private WallpaperChangedNotifier mWallpaperChangedNotifier;
-    private RotatingWallpaperComponentChecker mRotatingWallpaperComponentChecker;
-    private RecyclerView mImageGrid;
-    private IndividualAdapter mAdapter;
-    private WallpaperCategory mCategory;
-    private WallpaperRotationInitializer mWallpaperRotationInitializer;
-    private List<WallpaperInfo> mWallpapers;
-    private Point mTileSizePx;
+    Handler mHandler;
+    Random mRandom;
+
+    WallpaperChangedNotifier.Listener mWallpaperChangedListener =
+            new WallpaperChangedNotifier.Listener() {
+        @Override
+        public void onWallpaperChanged() {
+            if (mFormFactor != FormFactorChecker.FORM_FACTOR_DESKTOP) {
+                return;
+            }
+
+            ViewHolder selectedViewHolder = mImageGrid.findViewHolderForAdapterPosition(
+                    mAdapter.mSelectedAdapterPosition);
+
+            // Null remote ID => My Photos wallpaper, so deselect whatever was previously selected.
+            if (mWallpaperPreferences.getHomeWallpaperRemoteId() == null) {
+                if (selectedViewHolder instanceof SelectableHolder) {
+                    ((SelectableHolder) selectedViewHolder).setSelectionState(
+                            SelectableHolder.SELECTION_STATE_DESELECTED);
+                }
+            } else {
+                mAdapter.updateSelectedTile(mAdapter.mPendingSelectedAdapterPosition);
+            }
+        }
+    };
+    PackageStatusNotifier.Listener mAppStatusListener;
+
     private ProgressDialog mProgressDialog;
     private boolean mTestingMode;
     private CurrentWallpaperBottomSheetPresenter mCurrentWallpaperBottomSheetPresenter;
-    private WallpapersUiContainer mWallpapersUiContainer;
-    @FormFactor
-    private int mFormFactor;
     private SetIndividualHolder mPendingSetIndividualHolder;
-    private PackageStatusNotifier mPackageStatusNotifier;
 
     /**
      * Staged error dialog fragments that were unable to be shown when the activity didn't allow
@@ -130,9 +161,7 @@
     private SetWallpaperErrorDialogFragment mStagedSetWallpaperErrorDialogFragment;
     private StartRotationErrorDialogFragment mStagedStartRotationErrorDialogFragment;
 
-    private Handler mHandler;
     private Runnable mCurrentWallpaperBottomSheetExpandedRunnable;
-    private Random mRandom;
 
     /**
      * Whether {@code mUpdateDailyWallpaperThumbRunnable} has been run at least once in this
@@ -162,29 +191,6 @@
         }
     };
 
-    private WallpaperChangedNotifier.Listener mWallpaperChangedListener = new WallpaperChangedNotifier.Listener() {
-        @Override
-        public void onWallpaperChanged() {
-            if (mFormFactor != FormFactorChecker.FORM_FACTOR_DESKTOP) {
-                return;
-            }
-
-            ViewHolder selectedViewHolder = mImageGrid.findViewHolderForAdapterPosition(
-                    mAdapter.mSelectedAdapterPosition);
-
-            // Null remote ID => My Photos wallpaper, so deselect whatever was previously selected.
-            if (mWallpaperPreferences.getHomeWallpaperRemoteId() == null) {
-                if (selectedViewHolder instanceof SelectableHolder) {
-                    ((SelectableHolder) selectedViewHolder).setSelectionState(
-                            SelectableHolder.SELECTION_STATE_DESELECTED);
-                }
-            } else {
-                mAdapter.updateSelectedTile(mAdapter.mPendingSelectedAdapterPosition);
-            }
-        }
-    };
-    private PackageStatusNotifier.Listener mAppStatusListener;
-
     public static IndividualPickerFragment newInstance(String collectionId) {
         Bundle args = new Bundle();
         args.putString(ARG_CATEGORY_COLLECTION_ID, collectionId);
@@ -277,7 +283,7 @@
         }
     }
 
-    private void fetchWallpapers(boolean forceReload) {
+    void fetchWallpapers(boolean forceReload) {
         mWallpapers.clear();
         mCategory.fetchWallpapers(getActivity().getApplicationContext(), new WallpaperReceiver() {
             @Override
@@ -324,10 +330,7 @@
         }
         GridMarginDecoration.applyTo(mImageGrid);
 
-        mAdapter = new IndividualAdapter(mWallpapers);
-        mImageGrid.setAdapter(mAdapter);
-        mImageGrid.setLayoutManager(new GridLayoutManager(getActivity(), getNumColumns()));
-
+        setUpImageGrid();
         setUpBottomSheet();
 
         return view;
@@ -340,7 +343,7 @@
         }
     }
 
-    private void updateImageGridPadding(boolean addExtraBottomSpace) {
+    void updateImageGridPadding(boolean addExtraBottomSpace) {
         int gridPaddingPx = getResources().getDimensionPixelSize(R.dimen.grid_padding_desktop);
         int bottomSheetHeightPx = getResources().getDimensionPixelSize(
                 R.dimen.current_wallpaper_bottom_sheet_layout_height);
@@ -350,10 +353,16 @@
                 gridPaddingPx, gridPaddingPx, 0, paddingBottomPx);
     }
 
+    void setUpImageGrid() {
+        mAdapter = new IndividualAdapter(mWallpapers);
+        mImageGrid.setAdapter(mAdapter);
+        mImageGrid.setLayoutManager(new GridLayoutManager(getActivity(), getNumColumns()));
+    }
+
     /**
      * Enables and populates the "Currently set" wallpaper BottomSheet.
      */
-    private void setUpBottomSheet() {
+    void setUpBottomSheet() {
         mImageGrid.addOnScrollListener(new OnScrollListener() {
             @Override
             public void onScrolled(RecyclerView recyclerView, int dx, final int dy) {
@@ -619,14 +628,14 @@
         }
     }
 
-    private int getNumColumns() {
+    int getNumColumns() {
         return TileSizeCalculator.getNumIndividualColumns(getActivity());
     }
 
     /**
      * Returns whether rotation is enabled for this category.
      */
-    private boolean isRotationEnabled() {
+    boolean isRotationEnabled() {
         boolean isRotationSupported =
                 mRotatingWallpaperComponentChecker.getRotatingWallpaperSupport(getContext())
                         == RotatingWallpaperComponentChecker.ROTATING_WALLPAPER_SUPPORT_SUPPORTED;
@@ -745,10 +754,10 @@
     /**
      * RecyclerView Adapter subclass for the wallpaper tiles in the RecyclerView.
      */
-    private class IndividualAdapter extends RecyclerView.Adapter<ViewHolder> {
-        private static final int ITEM_VIEW_TYPE_ROTATION = 1;
-        private static final int ITEM_VIEW_TYPE_INDIVIDUAL_WALLPAPER = 2;
-        private static final int ITEM_VIEW_TYPE_MY_PHOTOS = 3;
+    class IndividualAdapter extends RecyclerView.Adapter<ViewHolder> {
+        static final int ITEM_VIEW_TYPE_ROTATION = 1;
+        static final int ITEM_VIEW_TYPE_INDIVIDUAL_WALLPAPER = 2;
+        static final int ITEM_VIEW_TYPE_MY_PHOTOS = 3;
 
         private final List<WallpaperInfo> mWallpapers;
 
@@ -892,7 +901,9 @@
             LayoutInflater layoutInflater = LayoutInflater.from(getActivity());
             View view = layoutInflater.inflate(R.layout.grid_item_my_photos, parent, false);
 
-            return new MyPhotosViewHolder(getActivity(), mTileSizePx.y, view);
+            return new MyPhotosViewHolder(getActivity(),
+                    ((MyPhotosStarterProvider) getActivity()).getMyPhotosStarter(),
+                    mTileSizePx.y, view);
         }
 
         /**
@@ -960,7 +971,7 @@
             updateImageGridPadding(isInLastRow /* addExtraBottomSpace */);
         }
 
-        private void onBindRotationHolder(ViewHolder holder, int position) {
+        void onBindRotationHolder(ViewHolder holder, int position) {
             if (mFormFactor == FormFactorChecker.FORM_FACTOR_DESKTOP) {
                 String collectionId = mCategory.getCollectionId();
                 ((DesktopRotationHolder) holder).bind(collectionId);
@@ -978,7 +989,7 @@
             }
         }
 
-        private void onBindIndividualHolder(ViewHolder holder, int position) {
+        void onBindIndividualHolder(ViewHolder holder, int position) {
             int wallpaperIndex = (isRotationEnabled() || mCategory.supportsCustomPhotos())
                     ? position - 1 : position;
             WallpaperInfo wallpaper = mWallpapers.get(wallpaperIndex);

diff --git a/src/com/android/wallpaper/picker/individual/MyPhotosViewHolder.java b/src/com/android/wallpaper/picker/individual/MyPhotosViewHolder.java
index 3489ef9..6844740 100755
--- a/src/com/android/wallpaper/picker/individual/MyPhotosViewHolder.java
+++ b/src/com/android/wallpaper/picker/individual/MyPhotosViewHolder.java

@@ -23,36 +23,40 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.provider.MediaStore;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.View;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 import com.android.wallpaper.R;
 import com.android.wallpaper.asset.Asset;
 import com.android.wallpaper.asset.ContentUriAsset;
-import com.android.wallpaper.picker.MyPhotosLauncher;
+import com.android.wallpaper.picker.MyPhotosStarter;
 
 /**
  * ViewHolder for a "my photos" tile presented in an individual category grid.
  */
 public class MyPhotosViewHolder extends ViewHolder implements View.OnClickListener,
-        MyPhotosLauncher.PermissionChangedListener {
+        MyPhotosStarter.PermissionChangedListener {
 
-    private Activity mActivity;
-    private ImageView mThumbnailView;
-    private ImageView mOverlayIconView;
+    private final Activity mActivity;
+    private final MyPhotosStarter mMyPhotosStarter;
+    private final ImageView mThumbnailView;
+    private final ImageView mOverlayIconView;
 
-    /* package */ MyPhotosViewHolder(Activity activity, int tileHeightPx, View itemView) {
+    /* package */ MyPhotosViewHolder(Activity activity, MyPhotosStarter myPhotosStarter,
+            int tileHeightPx, View itemView) {
         super(itemView);
 
         mActivity = activity;
+        mMyPhotosStarter = myPhotosStarter;
         itemView.getLayoutParams().height = tileHeightPx;
 
         itemView.findViewById(R.id.tile).setOnClickListener(this);
 
-        mThumbnailView = (ImageView) itemView.findViewById(R.id.thumbnail);
-        mOverlayIconView = (ImageView) itemView.findViewById(R.id.overlay_icon);
+        mThumbnailView = itemView.findViewById(R.id.thumbnail);
+        mOverlayIconView = itemView.findViewById(R.id.overlay_icon);
     }
 
     /**
@@ -109,7 +113,7 @@
 
     @Override
     public void onClick(View view) {
-        ((MyPhotosLauncher) mActivity).requestCustomPhotoPicker(this);
+        mMyPhotosStarter.requestCustomPhotoPicker(this);
     }
 
     /**

diff --git a/src/com/android/wallpaper/picker/individual/PreviewIndividualHolder.java b/src/com/android/wallpaper/picker/individual/PreviewIndividualHolder.java
index 92a80a7..3e5b451 100755
--- a/src/com/android/wallpaper/picker/individual/PreviewIndividualHolder.java
+++ b/src/com/android/wallpaper/picker/individual/PreviewIndividualHolder.java

@@ -15,9 +15,9 @@
  */
 package com.android.wallpaper.picker.individual;
 
+import android.util.Log;
 import android.view.View;
 
-import com.android.wallpaper.R;
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.module.UserEventLogger;
 
@@ -26,15 +26,20 @@
  * show a full-screen preview of the wallpaper.
  */
 class PreviewIndividualHolder extends IndividualHolder implements View.OnClickListener {
+    private final static String TAG = "PreviewIndividualHolder";
 
     public PreviewIndividualHolder(
             IndividualPickerActivity hostActivity, int tileHeightPx, View itemView) {
         super(hostActivity, tileHeightPx, itemView);
-        itemView.findViewById(R.id.tile).setOnClickListener(this);
+        mTileLayout.setOnClickListener(this);
     }
 
     @Override
     public void onClick(View view) {
+        if (mActivity.isFinishing()) {
+            Log.w(TAG, "onClick received on VH on finishing Activity");
+            return;
+        }
         UserEventLogger eventLogger =
                 InjectorProvider.getInjector().getUserEventLogger(mActivity);
         eventLogger.logIndividualWallpaperSelected(mWallpaper.getCollectionId(mActivity));

diff --git a/src/com/android/wallpaper/picker/individual/SelectableHolder.java b/src/com/android/wallpaper/picker/individual/SelectableHolder.java
index a8b65f5..7927533 100755
--- a/src/com/android/wallpaper/picker/individual/SelectableHolder.java
+++ b/src/com/android/wallpaper/picker/individual/SelectableHolder.java

@@ -15,7 +15,7 @@
  */
 package com.android.wallpaper.picker.individual;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 /**
  * Interface for a ViewHolder class which has a selection state which can be set by a caller.

diff --git a/src/com/android/wallpaper/util/DiskBasedLogger.java b/src/com/android/wallpaper/util/DiskBasedLogger.java
index f178573..5111376 100755
--- a/src/com/android/wallpaper/util/DiskBasedLogger.java
+++ b/src/com/android/wallpaper/util/DiskBasedLogger.java

@@ -15,13 +15,13 @@
  */
 package com.android.wallpaper.util;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import android.content.Context;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Process;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
 import com.android.wallpaper.compat.BuildCompat;
@@ -41,7 +41,8 @@
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 /**
  * Logs messages to logcat and for debuggable build types ("eng" or "userdebug") also mirrors logs

diff --git a/src/com/android/wallpaper/widget/GridMarginDecoration.java b/src/com/android/wallpaper/widget/GridMarginDecoration.java
index aac360f..fc0fbe2 100755
--- a/src/com/android/wallpaper/widget/GridMarginDecoration.java
+++ b/src/com/android/wallpaper/widget/GridMarginDecoration.java

@@ -16,11 +16,12 @@
 package com.android.wallpaper.widget;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ItemDecoration;
 import android.util.Log;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ItemDecoration;
+
 /**
  * Decorates a grid view item with margins on each side. Note that this pads on the bottom and
  * right, so the containing RecyclerView should add {@code paddingTop} and {@code paddingLeft} to

diff --git a/src/com/android/wallpaper/widget/MaterialProgressDrawable.java b/src/com/android/wallpaper/widget/MaterialProgressDrawable.java
index c07a010..d4de3cb 100755
--- a/src/com/android/wallpaper/widget/MaterialProgressDrawable.java
+++ b/src/com/android/wallpaper/widget/MaterialProgressDrawable.java

@@ -29,9 +29,6 @@
 import android.graphics.RectF;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.animation.Animation;
@@ -43,6 +40,10 @@
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+
 /**
  * Fancy progress indicator for Material theme.
  * <p>

diff --git a/src/com/android/wallpaper/widget/WallpaperThumbnailView.java b/src/com/android/wallpaper/widget/WallpaperThumbnailView.java
index 21ab64d..1006001 100755
--- a/src/com/android/wallpaper/widget/WallpaperThumbnailView.java
+++ b/src/com/android/wallpaper/widget/WallpaperThumbnailView.java

@@ -17,10 +17,11 @@
 
 import android.content.Context;
 import android.graphics.Matrix;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
+
 /**
  * Custom ImageView that mimics the home launcher screen wallpaper position by aligning start and
  * centering vertically its drawable. Scales down the image as much as possible without

diff --git a/src_override/com/android/wallpaper/module/WallpapersInjector.java b/src_override/com/android/wallpaper/module/WallpapersInjector.java
index 8259c29..7a426ce 100755
--- a/src_override/com/android/wallpaper/module/WallpapersInjector.java
+++ b/src_override/com/android/wallpaper/module/WallpapersInjector.java

@@ -17,12 +17,13 @@
 
 import android.content.Context;
 
-import android.support.v4.app.Fragment;
 import com.android.wallpaper.model.CategoryProvider;
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.monitor.PerformanceMonitor;
 import com.android.wallpaper.picker.PreviewFragment;
 
+import androidx.fragment.app.Fragment;
+
 /**
  * A concrete, real implementation of the dependency provider.
  */
commit	e0cd98febbe3196778c8649dd9ae7afb6858c64c	[log] [tgz]
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>	Wed May 01 00:22:05 2019 +0000
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>	Wed May 01 00:22:05 2019 +0000
tree	ce35581eda173f6579412415ef954452bb34f5a7
parent	86b09ce6eadf770440b8e58bb6514b57f9b50966 [diff]
parent	c382adc88285c8b889335707c5ea1d8acad7a03c [diff]