diff --git a/res/drawable-hdpi/ic_menu_refresh.png b/res/drawable-hdpi/ic_menu_refresh.png new file mode 100644 index 000000000..e13315f5d Binary files /dev/null and b/res/drawable-hdpi/ic_menu_refresh.png differ diff --git a/res/drawable-ldpi/ic_menu_refresh.png b/res/drawable-ldpi/ic_menu_refresh.png new file mode 100644 index 000000000..b25dc0616 Binary files /dev/null and b/res/drawable-ldpi/ic_menu_refresh.png differ diff --git a/res/drawable-mdpi/ic_menu_refresh.png b/res/drawable-mdpi/ic_menu_refresh.png new file mode 100644 index 000000000..30b660fdf Binary files /dev/null and b/res/drawable-mdpi/ic_menu_refresh.png differ diff --git a/res/drawable-xhdpi/ic_menu_refresh.png b/res/drawable-xhdpi/ic_menu_refresh.png new file mode 100644 index 000000000..9e9f10ee8 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_refresh.png differ diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java index f4f467995..22aa7892d 100644 --- a/src/org/fdroid/fdroid/AppDetails.java +++ b/src/org/fdroid/fdroid/AppDetails.java @@ -135,7 +135,7 @@ public class AppDetails extends ListActivity { buildtype.setText("bin"); } TextView added = (TextView) v.findViewById(R.id.added); - if (apk.added != null && apk.added != null) { + if (apk.added != null) { added.setVisibility(View.VISIBLE); added.setText(df.format(apk.added)); } else { @@ -462,18 +462,18 @@ public class AppDetails extends ListActivity { if (app == null) return true; DB.Apk curver = app.getCurrentVersion(); + List toShow = new ArrayList(2); if (app.installedVersion != null && curver != null && !app.installedVersion.equals(curver.version)) { - menu.add(Menu.NONE, INSTALL, 0, R.string.menu_update).setIcon( - android.R.drawable.ic_menu_add); + toShow.add(menu.add(Menu.NONE, INSTALL, 0, R.string.menu_update).setIcon( + R.drawable.ic_menu_refresh)); } if (app.installedVersion == null && curver != null) { - menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon( - android.R.drawable.ic_menu_add); + toShow.add(menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon( + android.R.drawable.ic_menu_add)); } else { - MenuItem launch = menu.add( Menu.NONE, LAUNCH, 1, R.string.menu_launch ).setIcon( - android.R.drawable.ic_media_play ); - CompatabilityUtils.showAsAction( launch ); + toShow.add(menu.add( Menu.NONE, LAUNCH, 1, R.string.menu_launch ).setIcon( + android.R.drawable.ic_media_play)); menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon( android.R.drawable.ic_menu_delete); } @@ -495,7 +495,7 @@ public class AppDetails extends ListActivity { menu.add(Menu.NONE, DONATE, 6, R.string.menu_donate).setIcon( android.R.drawable.ic_menu_view); } - + CompatabilityUtils.showAsAction(toShow); return true; } diff --git a/src/org/fdroid/fdroid/CompatabilityUtils.java b/src/org/fdroid/fdroid/CompatabilityUtils.java index dadf73636..f3e4b4a4f 100644 --- a/src/org/fdroid/fdroid/CompatabilityUtils.java +++ b/src/org/fdroid/fdroid/CompatabilityUtils.java @@ -3,8 +3,16 @@ package org.fdroid.fdroid; import android.os.Build; import android.view.MenuItem; +import java.util.List; + public class CompatabilityUtils { + protected static void showAsAction(List items) { + for ( MenuItem item : items ) { + showAsAction(item); + } + } + protected static void showAsAction( MenuItem item ) { if ( Build.VERSION.SDK_INT >= 11 ) { item.setShowAsAction( MenuItem.SHOW_AS_ACTION_IF_ROOM ); diff --git a/src/org/fdroid/fdroid/ManageRepo.java b/src/org/fdroid/fdroid/ManageRepo.java index 9416fb5ed..68ac78bc2 100644 --- a/src/org/fdroid/fdroid/ManageRepo.java +++ b/src/org/fdroid/fdroid/ManageRepo.java @@ -149,10 +149,11 @@ public class ManageRepo extends ListActivity { public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); - menu.add(Menu.NONE, ADD_REPO, 1, R.string.menu_add_repo).setIcon( + MenuItem item = menu.add(Menu.NONE, ADD_REPO, 1, R.string.menu_add_repo).setIcon( android.R.drawable.ic_menu_add); menu.add(Menu.NONE, REM_REPO, 2, R.string.menu_rem_repo).setIcon( android.R.drawable.ic_menu_close_clear_cancel); + CompatabilityUtils.showAsAction(item); return true; }