From 7a83557772dd2524de9d99db35dd81239bafc190 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@ivt.com.au>
Date: Tue, 9 Apr 2013 11:22:46 +1000
Subject: [PATCH] Show search/run MenuItems in action bar.

This is only done if the device api version is >= 11, and if there is
room in the action bar. I added the funcitonality in a new class
CompatabilityUtils because there may be other things for which this is
desirable.
---
 .gitignore                                    |  2 ++
 src/org/fdroid/fdroid/AppDetails.java         |  5 +++--
 src/org/fdroid/fdroid/CompatabilityUtils.java | 14 ++++++++++++++
 src/org/fdroid/fdroid/FDroid.java             |  3 ++-
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 src/org/fdroid/fdroid/CompatabilityUtils.java

diff --git a/.gitignore b/.gitignore
index 43a5ae231..896d1c284 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ gen/*
 proguard.cfg
 proguard-project.txt
 *~
+.idea
+*.iml
diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 5789da616..f4f467995 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -471,8 +471,9 @@ public class AppDetails extends ListActivity {
             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);
+            MenuItem launch = menu.add( Menu.NONE, LAUNCH, 1, R.string.menu_launch ).setIcon(
+					android.R.drawable.ic_media_play );
+            CompatabilityUtils.showAsAction( launch );
             menu.add(Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall).setIcon(
                     android.R.drawable.ic_menu_delete);
         }
diff --git a/src/org/fdroid/fdroid/CompatabilityUtils.java b/src/org/fdroid/fdroid/CompatabilityUtils.java
new file mode 100644
index 000000000..dadf73636
--- /dev/null
+++ b/src/org/fdroid/fdroid/CompatabilityUtils.java
@@ -0,0 +1,14 @@
+package org.fdroid.fdroid;
+
+import android.os.Build;
+import android.view.MenuItem;
+
+public class CompatabilityUtils {
+
+    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/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index 1460b1bd8..fae6c497e 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -150,12 +150,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);
+		CompatabilityUtils.showAsAction( search );
         return true;
     }