diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-08-28 12:37:09 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-08-28 12:37:09 +0200 |
| commit | 3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f (patch) | |
| tree | 3934d502ade4b8bd6b2a61f27ab1a3665d6d6322 /main/src/cgeo/geocaching/maps | |
| parent | 2e17db77a3358e8b11da126a846d337fa6b1db90 (diff) | |
| parent | d48db1e4b122347cfa6a30e5d97b93afab5f7fb4 (diff) | |
| download | cgeo-3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f.zip cgeo-3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f.tar.gz cgeo-3fe7f69b0c99cb64b0dcbd72f4d46c4ce5961d9f.tar.bz2 | |
Merge branch 'issue-2803' into upstream
Conflicts:
main/res/xml/preferences.xml
Diffstat (limited to 'main/src/cgeo/geocaching/maps')
| -rw-r--r-- | main/src/cgeo/geocaching/maps/CGeoMap.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index d64a1d8..0d24cc1 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -429,7 +429,7 @@ public class CGeoMap extends AbstractMap implements ViewFactory { // reset status noMapTokenShowed = false; - ActivityMixin.keepScreenOn(activity, true); + ActivityMixin.onCreate(activity, true); // set layout |