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

Replace CompatibilityUtils with android.support.v4.MenuItemCompat

Browse Source
This commit is contained in:
Peter Serwylo 2013-04-10 13:04:49 +10:00
parent 8679a1241f
commit d2c8f0de68
6 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ proguard-project.txt
*~ *~
.idea .idea
*.iml *.iml
out

BIN
libs/android-support-v4.jar Normal file
View File

Binary file not shown.

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

@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import android.support.v4.view.MenuItemCompat;
import org.xml.sax.XMLReader; import org.xml.sax.XMLReader;
import android.app.AlertDialog; import android.app.AlertDialog;
@ -495,7 +496,9 @@ 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);
} }
CompatabilityUtils.showAsAction(toShow); for (MenuItem item : toShow) {
MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
}
return true; return true;
} }

22
src/org/fdroid/fdroid/CompatabilityUtils.java
View File

@ -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<MenuItem> 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 );
}
}
}

3
src/org/fdroid/fdroid/FDroid.java
View File

@ -25,6 +25,7 @@ import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.Vector; import java.util.Vector;
import android.support.v4.view.MenuItemCompat;
import org.fdroid.fdroid.DB.App; import org.fdroid.fdroid.DB.App;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
@ -156,7 +157,7 @@ public class FDroid extends TabActivity implements OnItemClickListener,
android.R.drawable.ic_menu_preferences); android.R.drawable.ic_menu_preferences);
menu.add(Menu.NONE, ABOUT, 5, R.string.menu_about).setIcon( menu.add(Menu.NONE, ABOUT, 5, R.string.menu_about).setIcon(
android.R.drawable.ic_menu_help); android.R.drawable.ic_menu_help);
CompatabilityUtils.showAsAction( search ); MenuItemCompat.setShowAsAction(search, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
return true; return true;
} }

3
src/org/fdroid/fdroid/ManageRepo.java
View File

@ -36,6 +36,7 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.view.MenuItemCompat;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -153,7 +154,7 @@ public class ManageRepo extends ListActivity {
android.R.drawable.ic_menu_add); android.R.drawable.ic_menu_add);
menu.add(Menu.NONE, REM_REPO, 2, R.string.menu_rem_repo).setIcon( menu.add(Menu.NONE, REM_REPO, 2, R.string.menu_rem_repo).setIcon(
android.R.drawable.ic_menu_close_clear_cancel); android.R.drawable.ic_menu_close_clear_cancel);
CompatabilityUtils.showAsAction(item); MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
return true; return true;
} }