Snap for 5671315 from 5cc6db47d9fed6bb42251a8b62e7fb4f3eaf7fc1 to qt-aml-release
Change-Id: I4d5c5fe90192c2eb5eaee946c440b3b604227014
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index fe25627..95a66fd 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -20,7 +20,7 @@
<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="select_wallpaper_label" msgid="6989581259339646085">"ৱালপেপাৰৰ শিতানসমূহ"</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>
@@ -28,6 +28,7 @@
<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="wallpaper_destination_both" msgid="1124197176741944063">"গৃহ আৰু লক স্ক্ৰীণ"</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>
@@ -78,4 +79,5 @@
<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>
+ <string name="preview" msgid="1774602101743861071">"পূৰ্বদৰ্শন"</string>
</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index caa61dc..32e791e 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -20,7 +20,7 @@
<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="select_wallpaper_label" msgid="6989581259339646085">"ୱାଲ୍ପେପର୍ ବର୍ଗଗୁଡ଼ିକ"</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>
@@ -28,6 +28,7 @@
<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="wallpaper_destination_both" msgid="1124197176741944063">"ହୋମ୍ ଓ ଲକ୍ ସ୍କ୍ରିନ୍"</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>
@@ -78,4 +79,5 @@
<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>
+ <string name="preview" msgid="1774602101743861071">"ପ୍ରିଭ୍ୟୁ"</string>
</resources>
diff --git a/src/com/android/wallpaper/module/DefaultCategoryProvider.java b/src/com/android/wallpaper/module/DefaultCategoryProvider.java
index 4223ce4..721ccf1 100755
--- a/src/com/android/wallpaper/module/DefaultCategoryProvider.java
+++ b/src/com/android/wallpaper/module/DefaultCategoryProvider.java
@@ -118,18 +118,20 @@
}
};
- new FetchCategoriesTask(delegatingReceiver).execute();
+ new FetchCategoriesTask(delegatingReceiver, mAppContext).execute();
}
/**
* AsyncTask subclass used for fetching all the categories and pushing them one at a time to
* the receiver.
*/
- protected class FetchCategoriesTask extends AsyncTask<Void, Category, Void> {
+ protected static class FetchCategoriesTask extends AsyncTask<Void, Category, Void> {
private CategoryReceiver mReceiver;
+ protected final Context mAppContext;
- public FetchCategoriesTask(CategoryReceiver receiver) {
+ public FetchCategoriesTask(CategoryReceiver receiver, Context context) {
mReceiver = receiver;
+ mAppContext = context.getApplicationContext();
}
@Override
diff --git a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
index bd0c39d..654ec13 100755
--- a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
+++ b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
@@ -18,6 +18,7 @@
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context;
+import android.content.res.Configuration;
import android.content.res.Resources.NotFoundException;
import android.graphics.Point;
import android.graphics.PorterDuff.Mode;
@@ -35,6 +36,7 @@
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.GridLayoutManager;
@@ -107,6 +109,7 @@
private static final boolean PROGRESS_DIALOG_INDETERMINATE = true;
private static final String TAG_SET_WALLPAPER_ERROR_DIALOG_FRAGMENT =
"individual_set_wallpaper_error_dialog";
+ private static final String KEY_NIGHT_MODE = "IndividualPickerFragment.NIGHT_MODE";
WallpaperPreferences mWallpaperPreferences;
WallpaperChangedNotifier mWallpaperChangedNotifier;
@@ -269,6 +272,12 @@
mWallpaperRotationInitializer = mCategory.getWallpaperRotationInitializer();
+ // Clear Glide's cache if night-mode changed to ensure thumbnails are reloaded
+ if (savedInstanceState != null && (savedInstanceState.getInt(KEY_NIGHT_MODE)
+ != (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK))) {
+ Glide.get(getContext()).clearMemory();
+ }
+
fetchWallpapers(false);
if (mCategory.supportsThirdParty()) {
@@ -316,6 +325,13 @@
}
@Override
+ public void onSaveInstanceState(@NonNull Bundle outState) {
+ super.onSaveInstanceState(outState);
+ outState.putInt(KEY_NIGHT_MODE,
+ getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK);
+ }
+
+ @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_individual_picker, container, false);
