summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Isganitis <brianji@google.com>2022-02-15 13:31:40 -0800
committerBrian Isganitis <brianji@google.com>2022-02-15 13:31:40 -0800
commit8350fbdc39bcf47ecfd145210f3bce0382668efc (patch)
tree21f018e345ef6bb6a4b22696cb76875cc2f82c01 /src
parent7b046e7e2778bacc80db12e9abd650054311b59b (diff)
downloadLauncher3-8350fbdc39bcf47ecfd145210f3bce0382668efc.tar.gz
Reverse order of long-press menu.
Test: Manual Bug: 219777079 Change-Id: I161f10a5e7491aaa3926eba714ae2b46a10a2e62
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/views/OptionsPopupView.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java
index 95bce31796..867e488155 100644
--- a/src/com/android/launcher3/views/OptionsPopupView.java
+++ b/src/com/android/launcher3/views/OptionsPopupView.java
@@ -180,18 +180,6 @@ public class OptionsPopupView extends ArrowPopup<Launcher>
*/
public static ArrayList<OptionItem> getOptions(Launcher launcher) {
ArrayList<OptionItem> options = new ArrayList<>();
- options.add(new OptionItem(launcher,
- R.string.settings_button_text,
- R.drawable.ic_setting,
- LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS,
- OptionsPopupView::startSettings));
- if (!WidgetsModel.GO_DISABLE_WIDGETS) {
- options.add(new OptionItem(launcher,
- R.string.widget_button_text,
- R.drawable.ic_widget,
- LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS,
- OptionsPopupView::onWidgetsClicked));
- }
int resString = Utilities.existsStyleWallpapers(launcher) ?
R.string.styles_wallpaper_button_text : R.string.wallpaper_button_text;
int resDrawable = Utilities.existsStyleWallpapers(launcher) ?
@@ -201,6 +189,18 @@ public class OptionsPopupView extends ArrowPopup<Launcher>
resDrawable,
IGNORE,
OptionsPopupView::startWallpaperPicker));
+ if (!WidgetsModel.GO_DISABLE_WIDGETS) {
+ options.add(new OptionItem(launcher,
+ R.string.widget_button_text,
+ R.drawable.ic_widget,
+ LAUNCHER_WIDGETSTRAY_BUTTON_TAP_OR_LONGPRESS,
+ OptionsPopupView::onWidgetsClicked));
+ }
+ options.add(new OptionItem(launcher,
+ R.string.settings_button_text,
+ R.drawable.ic_setting,
+ LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS,
+ OptionsPopupView::startSettings));
return options;
}