pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Hindi no more!

Browse source
This commit is contained in:
Dmitry Kunin 2013-06-26 15:15:31 +03:00 • committed by Alex Zolotarev
parent 9c137170b3
commit 660201a200
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
android/src/com/mapswithme/maps/MapObjectFragment.java
View file

@ -296,26 +296,11 @@ public class MapObjectFragment extends Fragment
super.onCreateOptionsMenu(menu, inflater);
if (MapObjectType.BOOKMARK.equals(mType))
{
final MenuItem editItem = menu.add(Menu.NONE, MENU_EDIT, MENU_EDIT, R.string.edit);
editItem.setIcon(R.drawable.edit_bookmark);
if (Utils.apiEqualOrGreaterThan(11))
editItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
Utils.addMenuCompat(menu, MENU_EDIT, MENU_EDIT, R.string.edit, R.drawable.edit_bookmark);
else
{
final MenuItem addItem = menu.add(Menu.NONE, MENU_ADD, MENU_ADD, R.string.add_to_bookmarks);
addItem.setIcon(R.drawable.add_bookmark);
if (Utils.apiEqualOrGreaterThan(11))
addItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
Utils.addMenuCompat(menu, MENU_ADD, MENU_ADD, R.string.add_to_bookmarks, R.drawable.add_bookmark);
final MenuItem shareItem = menu.add(Menu.NONE, MENU_SHARE, MENU_SHARE, R.string.share);
shareItem.setIcon(R.drawable.share);
if (Utils.apiEqualOrGreaterThan(11))
shareItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
Log.d("MOA", "Type" + mType);
Utils.addMenuCompat(menu, MENU_SHARE, MENU_SHARE, R.string.share, R.drawable.share);
}
@Override

14
android/src/com/mapswithme/util/Utils.java
View file

@ -6,12 +6,15 @@ import java.io.InputStream;
import java.util.Map;
import java.util.Scanner;
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.ClipData;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.Window;
import android.widget.EditText;
import android.widget.Toast;
@ -140,6 +143,17 @@ final public class Utils
return sb.toString();
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public static MenuItem addMenuCompat(Menu menu, int id, int order, int titleResId, int iconResId)
{
final MenuItem mItem = menu.add(Menu.NONE, id, order, titleResId);
mItem.setIcon(iconResId);
if (apiEqualOrGreaterThan(11))
mItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
return mItem;
}
// utility class
private Utils() {};
}