diff --git a/.gitignore b/.gitignore index 43a5ae231..a5e3b6aea 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ gen/* proguard.cfg proguard-project.txt *~ +.idea +*.iml +out diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar new file mode 100644 index 000000000..65ebaf8dc Binary files /dev/null and b/libs/android-support-v4.jar differ 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 5789da616..e99b1311e 100644 --- a/src/org/fdroid/fdroid/AppDetails.java +++ b/src/org/fdroid/fdroid/AppDetails.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Vector; +import android.support.v4.view.MenuItemCompat; import org.xml.sax.XMLReader; import android.app.AlertDialog; @@ -135,7 +136,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,17 +463,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 { - menu.add(Menu.NONE, LAUNCH, 1, R.string.menu_launch).setIcon( - android.R.drawable. ic_media_play); + 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); } @@ -494,7 +496,9 @@ public class AppDetails extends ListActivity { menu.add(Menu.NONE, DONATE, 6, R.string.menu_donate).setIcon( android.R.drawable.ic_menu_view); } - + for (MenuItem item : toShow) { + MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); + } return true; } diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java index 1460b1bd8..712362dfc 100644 --- a/src/org/fdroid/fdroid/FDroid.java +++ b/src/org/fdroid/fdroid/FDroid.java @@ -25,6 +25,7 @@ import java.util.Comparator; import java.util.Date; import java.util.Vector; +import android.support.v4.view.MenuItemCompat; import org.fdroid.fdroid.DB.App; import org.fdroid.fdroid.R; @@ -150,12 +151,13 @@ public class FDroid extends TabActivity implements OnItemClickListener, android.R.drawable.ic_menu_rotate); menu.add(Menu.NONE, MANAGE_REPO, 2, R.string.menu_manage).setIcon( android.R.drawable.ic_menu_agenda); - menu.add(Menu.NONE, SEARCH, 3, R.string.menu_search).setIcon( + MenuItem search = menu.add(Menu.NONE, SEARCH, 3, R.string.menu_search).setIcon( android.R.drawable.ic_menu_search); menu.add(Menu.NONE, PREFERENCES, 4, R.string.menu_preferences).setIcon( android.R.drawable.ic_menu_preferences); menu.add(Menu.NONE, ABOUT, 5, R.string.menu_about).setIcon( android.R.drawable.ic_menu_help); + MenuItemCompat.setShowAsAction(search, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); return true; } diff --git a/src/org/fdroid/fdroid/ManageRepo.java b/src/org/fdroid/fdroid/ManageRepo.java index 9416fb5ed..bb2f2b926 100644 --- a/src/org/fdroid/fdroid/ManageRepo.java +++ b/src/org/fdroid/fdroid/ManageRepo.java @@ -36,6 +36,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.v4.view.MenuItemCompat; import android.text.format.DateFormat; import android.util.Log; import android.view.LayoutInflater; @@ -149,10 +150,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); + MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); return true; }