diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2009-09-07 18:51:47 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2009-09-07 19:42:48 +0800 |
| commit | 120bf5852333f1b5208f6f4ea8b1fa9ea6b5284f (patch) | |
| tree | fecf17c5b9170f22cd92844cf04ee4b0ddca36dc /src/com/android/camera/MenuHelper.java | |
| parent | 9b93bcbe3ccc49db5ce42de19fda1d3a9ef0011b (diff) | |
| download | packages_apps_LegacyCamera-120bf5852333f1b5208f6f4ea8b1fa9ea6b5284f.zip packages_apps_LegacyCamera-120bf5852333f1b5208f6f4ea8b1fa9ea6b5284f.tar.gz packages_apps_LegacyCamera-120bf5852333f1b5208f6f4ea8b1fa9ea6b5284f.tar.bz2 | |
Fix 1977974: For photos without location data, don't offer to "Show on Maps"
Change-Id: I7445e365ad9158312149dc80cf73361655171ba2
Diffstat (limited to 'src/com/android/camera/MenuHelper.java')
| -rw-r--r-- | src/com/android/camera/MenuHelper.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java index 09892bb..528380a 100644 --- a/src/com/android/camera/MenuHelper.java +++ b/src/com/android/camera/MenuHelper.java @@ -88,6 +88,7 @@ public class MenuHelper { public static final int MENU_IMAGE_ROTATE_LEFT = 20; public static final int MENU_IMAGE_ROTATE_RIGHT = 21; public static final int MENU_IMAGE_TOSS = 22; + public static final int MENU_IMAGE_SHOWMAP = 25; public static final int MENU_VIDEO_PLAY = 23; public static final int MENU_VIDEO_SHARE = 24; @@ -171,6 +172,17 @@ public class MenuHelper { } } + public static boolean hasLatLngData(IImage image) { + return ExifInterface.getLatLng(getExifData(image)) != null; + } + + public static void enableShowOnMapMenuItem(Menu menu, boolean enabled) { + MenuItem item = menu.findItem(MENU_IMAGE_SHOWMAP); + if (item != null) { + item.setEnabled(enabled); + } + } + private static void setDetailsValue(View d, String text, int valueId) { ((TextView) d.findViewById(valueId)).setText(text); } @@ -749,8 +761,9 @@ public class MenuHelper { } if ((inclusions & INCLUDE_SHOWMAP_MENU) != 0) { - MenuItem showOnMapItem = menu.add(0, 0, 80, R.string.show_on_map) - .setOnMenuItemClickListener( + MenuItem showOnMapItem = menu.add(0, MENU_IMAGE_SHOWMAP, + 80, R.string.show_on_map); + showOnMapItem.setOnMenuItemClickListener( new MenuItem.OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { return onShowMapClicked(onInvoke, |