Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swapped order of update/uninstall menu options

Browse Source
This commit is contained in:
Ciaran Gultnieks 2010-11-05 07:58:47 +00:00
parent 48f2fc14ea
commit f5d896b0a3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/fdroid/fdroid/AppDetails.java
View File

@ -284,6 +284,11 @@ public class AppDetails extends ListActivity {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
menu.clear(); menu.clear();
DB.Apk curver = app.getCurrentVersion(); 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) { if (app.installedVersion == null && curver != null) {
menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon( menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon(
android.R.drawable.ic_menu_add); 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( menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon(
android.R.drawable.ic_menu_delete); 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) { if (app.webURL.length() > 0) {
menu.add(Menu.NONE, WEBSITE, 2, R.string.menu_website).setIcon( menu.add(Menu.NONE, WEBSITE, 2, R.string.menu_website).setIcon(
android.R.drawable.ic_menu_view); android.R.drawable.ic_menu_view);