diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-08-25 20:59:32 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-08-25 20:59:32 +0200 |
| commit | cf7454c158352a105668e45d29ed2213413a2946 (patch) | |
| tree | e04ccf70fa7f792dc3337dd8619bd537d29ec812 /main/src/cgeo/geocaching/MainActivity.java | |
| parent | fa8fcdda9ae9f8da76aed3887e3d7999c1e27c4b (diff) | |
| parent | 5e7039af76da1d9f40c9a8a1a796cad45dba064f (diff) | |
| download | cgeo-cf7454c158352a105668e45d29ed2213413a2946.zip cgeo-cf7454c158352a105668e45d29ed2213413a2946.tar.gz cgeo-cf7454c158352a105668e45d29ed2213413a2946.tar.bz2 | |
Merge remote-tracking branch 'origin/release'
Conflicts:
main/res/values/strings.xml
Diffstat (limited to 'main/src/cgeo/geocaching/MainActivity.java')
| -rw-r--r-- | main/src/cgeo/geocaching/MainActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java index 4f14ba4..8377091 100644 --- a/main/src/cgeo/geocaching/MainActivity.java +++ b/main/src/cgeo/geocaching/MainActivity.java @@ -739,7 +739,7 @@ public class MainActivity extends AbstractActionBarActivity { } @Override - protected ShowcaseViewBuilder getShowcase() { + public ShowcaseViewBuilder getShowcase() { return new ShowcaseViewBuilder(this) .setTarget(new ActionViewTarget(this, ActionViewTarget.Type.OVERFLOW)) .setContent(R.string.showcase_main_title, R.string.showcase_main_text); |