From f5d896b0a3e66171782b4fca6ebdcd92fe6a22d7 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Fri, 5 Nov 2010 07:58:47 +0000 Subject: [PATCH] Swapped order of update/uninstall menu options --- src/org/fdroid/fdroid/AppDetails.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java index 508fd0cf5..542cccd44 100644 --- a/src/org/fdroid/fdroid/AppDetails.java +++ b/src/org/fdroid/fdroid/AppDetails.java @@ -284,6 +284,11 @@ public class AppDetails extends ListActivity { super.onCreateOptionsMenu(menu); menu.clear(); DB.Apk curver = app.getCurrentVersion(); + if (app.installedVersion != null + && !app.installedVersion.equals(curver.version)) { + menu.add(Menu.NONE, INSTALL, 0, R.string.menu_update).setIcon( + android.R.drawable.ic_menu_add); + } if (app.installedVersion == null && curver != null) { menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon( android.R.drawable.ic_menu_add); @@ -291,11 +296,6 @@ public class AppDetails extends ListActivity { menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon( android.R.drawable.ic_menu_delete); } - if (app.installedVersion != null - && !app.installedVersion.equals(curver.version)) { - menu.add(Menu.NONE, INSTALL, 1, R.string.menu_update).setIcon( - android.R.drawable.ic_menu_add); - } if (app.webURL.length() > 0) { menu.add(Menu.NONE, WEBSITE, 2, R.string.menu_website).setIcon( android.R.drawable.ic_menu_view);