aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-04-13 21:48:00 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-04-13 21:48:00 +0200
commit7acd546ce1e4b554d698a0804bbf0706fbd9997e (patch)
treeb49443406f05502aa4ecb11f484fb9f85b8b2c6f
parent2f3e8ddd18303123a1b81995357f27461fa1d586 (diff)
parent76fff2d672a0791c3ae96f4b09c4d82819462a83 (diff)
downloadcgeo-7acd546ce1e4b554d698a0804bbf0706fbd9997e.zip
cgeo-7acd546ce1e4b554d698a0804bbf0706fbd9997e.tar.gz
cgeo-7acd546ce1e4b554d698a0804bbf0706fbd9997e.tar.bz2
Merge branch 'release' into upstream
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java2
-rw-r--r--main/src/cgeo/geocaching/activity/AbstractActivity.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 0f86de6..a8fa8ee 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -357,7 +357,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
case R.id.value: // coordinates, gc-code, name
assert view instanceof TextView;
clickedItemText = ((TextView) view).getText();
- final String itemTitle = (String) ((TextView) ((View) view.getParent()).findViewById(R.id.name)).getText();
+ final CharSequence itemTitle = ((TextView) ((View) view.getParent()).findViewById(R.id.name)).getText();
buildDetailsContextMenu(menu, clickedItemText, itemTitle, true);
break;
case R.id.shortdesc:
diff --git a/main/src/cgeo/geocaching/activity/AbstractActivity.java b/main/src/cgeo/geocaching/activity/AbstractActivity.java
index 1ed9b9b..542dd05 100644
--- a/main/src/cgeo/geocaching/activity/AbstractActivity.java
+++ b/main/src/cgeo/geocaching/activity/AbstractActivity.java
@@ -151,7 +151,7 @@ public abstract class AbstractActivity extends FragmentActivity implements IAbst
new Keyboard(this).show(view);
}
- protected void buildDetailsContextMenu(final ContextMenu menu, final CharSequence clickedItemText, final String fieldTitle, final boolean copyOnly) {
+ protected void buildDetailsContextMenu(final ContextMenu menu, final CharSequence clickedItemText, final CharSequence fieldTitle, final boolean copyOnly) {
menu.setHeaderTitle(fieldTitle);
getMenuInflater().inflate(R.menu.details_context, menu);
menu.findItem(R.id.menu_translate_to_sys_lang).setVisible(!copyOnly);