diff --git a/.gitignore b/.gitignore index 896d1c284..a5e3b6aea 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ 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/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java index 22aa7892d..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; @@ -495,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); } - CompatabilityUtils.showAsAction(toShow); + for (MenuItem item : toShow) { + MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); + } return true; } diff --git a/src/org/fdroid/fdroid/CompatabilityUtils.java b/src/org/fdroid/fdroid/CompatabilityUtils.java deleted file mode 100644 index f3e4b4a4f..000000000 --- a/src/org/fdroid/fdroid/CompatabilityUtils.java +++ /dev/null @@ -1,22 +0,0 @@ -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/FDroid.java b/src/org/fdroid/fdroid/FDroid.java index fae6c497e..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; @@ -156,7 +157,7 @@ public class FDroid extends TabActivity implements OnItemClickListener, 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 ); + 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 68ac78bc2..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; @@ -153,7 +154,7 @@ public class ManageRepo extends ListActivity { 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); + MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); return true; }