diff --git a/res/drawable/enter_home_gardening_icon.xml b/res/drawable/enter_home_gardening_icon.xml new file mode 100644 index 0000000000..039258e47b --- /dev/null +++ b/res/drawable/enter_home_gardening_icon.xml @@ -0,0 +1,25 @@ + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index aebc1d0446..b54d4f795e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -250,6 +250,8 @@ Wallpapers Wallpaper & style + + Edit Home Screen Home settings diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index 315cbadd04..64ad390f51 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -18,6 +18,7 @@ package com.android.launcher3.views; import static androidx.core.content.ContextCompat.getColorStateList; import static com.android.launcher3.config.FeatureFlags.ENABLE_MATERIAL_U_POPUP; +import static com.android.launcher3.config.FeatureFlags.MULTI_SELECT_EDIT_MODE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS; @@ -205,6 +206,13 @@ public class OptionsPopupView extends ArrowPopup LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS, OptionsPopupView::onWidgetsClicked)); } + if (MULTI_SELECT_EDIT_MODE.get()) { + options.add(new OptionItem(launcher, + R.string.edit_home_screen, + R.drawable.enter_home_gardening_icon, + LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS, + OptionsPopupView::enterHomeGardening)); + } options.add(new OptionItem(launcher, R.string.settings_button_text, R.drawable.ic_setting, @@ -213,6 +221,10 @@ public class OptionsPopupView extends ArrowPopup return options; } + private static boolean enterHomeGardening(View view) { + return true; + } + private static boolean onWidgetsClicked(View view) { return openWidgets(Launcher.getLauncher(view.getContext())) != null; }