Merge "Reverse order of long-press menu." (770bd08b) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/views/OptionsPopupView.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -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;
		}