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

Make install and run to be always shown in AB

Browse Source
This commit is contained in:
Daniel Martí 2013-07-19 23:21:55 +02:00
parent 86464608d7
commit 44824fa6cf
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -559,25 +559,39 @@ public class AppDetails extends ListActivity {
if (app == null) if (app == null)
return true; return true;
DB.Apk curver = app.getCurrentVersion(); DB.Apk curver = app.getCurrentVersion();
List<MenuItem> toShow = new ArrayList<MenuItem>(2);
if (app.hasUpdates == true) { if (app.hasUpdates == true) {
toShow.add(menu.add(Menu.NONE, INSTALL, 0, R.string.menu_update).setIcon( MenuItemCompat.setShowAsAction(menu.add(
R.drawable.ic_menu_refresh)); Menu.NONE, INSTALL, 0, R.string.menu_update)
.setIcon(R.drawable.ic_menu_refresh),
MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
} }
if (app.installedVersion == null && curver != null) { if (app.installedVersion == null && curver != null) {
toShow.add(menu.add(Menu.NONE, INSTALL, 1, R.string.menu_install).setIcon( MenuItemCompat.setShowAsAction(menu.add(
android.R.drawable.ic_menu_add)); Menu.NONE, INSTALL, 1, R.string.menu_install)
.setIcon(android.R.drawable.ic_menu_add),
MenuItemCompat.SHOW_AS_ACTION_ALWAYS |
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
} else { } else {
toShow.add(menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon( MenuItemCompat.setShowAsAction(menu.add(
android.R.drawable.ic_menu_delete)); Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall)
.setIcon(android.R.drawable.ic_menu_delete),
MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
if (mPm.getLaunchIntentForPackage(app.id) != null) { if (mPm.getLaunchIntentForPackage(app.id) != null) {
toShow.add(menu.add( Menu.NONE, LAUNCH, 1, R.string.menu_launch).setIcon( MenuItemCompat.setShowAsAction(menu.add(
android.R.drawable.ic_media_play)); Menu.NONE, LAUNCH, 1, R.string.menu_launch)
.setIcon(android.R.drawable.ic_media_play),
MenuItemCompat.SHOW_AS_ACTION_ALWAYS |
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
} }
} }
toShow.add(menu.add( Menu.NONE, SHARE, 1, R.string.menu_share).setIcon( MenuItemCompat.setShowAsAction(menu.add(
android.R.drawable.ic_menu_share)); Menu.NONE, SHARE, 1, R.string.menu_share)
.setIcon(android.R.drawable.ic_menu_share),
MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
if (app.detail_webURL.length() > 0) { if (app.detail_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(
@ -597,12 +611,7 @@ public class AppDetails extends ListActivity {
menu.add(Menu.NONE, DONATE, 6, R.string.menu_donate).setIcon( menu.add(Menu.NONE, DONATE, 6, R.string.menu_donate).setIcon(
android.R.drawable.ic_menu_view); android.R.drawable.ic_menu_view);
} }
for (MenuItem item : toShow) {
MenuItemCompat.setShowAsAction(item,
MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
}
return true; return true;
} }