diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-07-05 08:13:15 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-07-05 08:13:15 +0200 |
| commit | dc3b147bf47d6501a989b96fbc9b8d370e2a7a41 (patch) | |
| tree | fd43fc00927e6e2d393fc93171b8ef4d4a770bfd /main/src/cgeo/geocaching/maps | |
| parent | 61232ef02c14929d39f8173b509b8a9f9a233534 (diff) | |
| parent | 0ca0984ff20316298ba87ce200e888df2991611c (diff) | |
| download | cgeo-dc3b147bf47d6501a989b96fbc9b8d370e2a7a41.zip cgeo-dc3b147bf47d6501a989b96fbc9b8d370e2a7a41.tar.gz cgeo-dc3b147bf47d6501a989b96fbc9b8d370e2a7a41.tar.bz2 | |
Merge remote-tracking branch 'schwabe/theme_fixes'
Conflicts:
main/res/menu/map_activity.xml
Diffstat (limited to 'main/src/cgeo/geocaching/maps')
| -rw-r--r-- | main/src/cgeo/geocaching/maps/CGeoMap.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index d0a9e5e..e0366c4 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -483,10 +483,8 @@ public class CGeoMap extends AbstractMap implements ViewFactory { // set layout - //ActivityMixin.setTheme(activity); - // TODO: set a proper theme + ActivityMixin.setTheme(activity); if (Build.VERSION.SDK_INT > Build.VERSION_CODES.HONEYCOMB) { - activity.setTheme(android.R.style.Theme_Holo); activity.getActionBar().setDisplayHomeAsUpEnabled(true); } activity.setContentView(mapProvider.getMapLayoutId()); |