summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBeth Thibodeau <ethibodeau@google.com>2019-04-12 18:43:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-12 18:43:53 +0000
commit2a0bb40a7622b6e551c968cbc871a235dd98fb6c (patch)
tree925392bed91cff9b738fc38e29695f7ee02eff69 /src
parent9beda35dc9515f8aafd10d23dc33655aaa9168c4 (diff)
parent14e33683401de302a2d942f9cd7c0ce3625c8fa6 (diff)
downloadandroid_packages_apps_Trebuchet-2a0bb40a7622b6e551c968cbc871a235dd98fb6c.tar.gz
android_packages_apps_Trebuchet-2a0bb40a7622b6e551c968cbc871a235dd98fb6c.tar.bz2
android_packages_apps_Trebuchet-2a0bb40a7622b6e551c968cbc871a235dd98fb6c.zip
Merge "Add extra for starting wallpaper from launcher" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/views/OptionsPopupView.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 29866cf9a..b6c41b0ea 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -212,6 +212,8 @@ public class OptionsPopupView extends ArrowPopup
launcher.getWorkspace().getWallpaperOffsetForCenterPage());
if (!existsStyleWallpapers(launcher)) {
intent.putExtra(EXTRA_WALLPAPER_FLAVOR, "wallpaper_only");
+ } else {
+ intent.putExtra(EXTRA_WALLPAPER_FLAVOR, "focus_wallpaper");
}
String pickerPackage = launcher.getString(R.string.wallpaper_picker_package);
if (!TextUtils.isEmpty(pickerPackage)) {