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/res/menu | |
| 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/res/menu')
| -rw-r--r-- | main/res/menu/map_activity.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml index f232fc4..2b2f1eb 100644 --- a/main/res/menu/map_activity.xml +++ b/main/res/menu/map_activity.xml @@ -11,6 +11,7 @@ <item android:id="@+id/menu_select_mapview" android:icon="@drawable/ic_menu_mapmode" + android:showAsAction="ifRoom|withText" android:title="@string/map_view_map" app:showAsAction="ifRoom|withText"> <menu> @@ -23,18 +24,21 @@ <item android:id="@+id/menu_map_live" android:icon="@drawable/ic_menu_refresh" + android:showAsAction="ifRoom|withText" android:title="@string/map_live_disable" app:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/menu_store_caches" android:icon="@drawable/ic_menu_set_as" + android:showAsAction="ifRoom|withText" android:title="@string/caches_store_offline" app:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/submenu_modes" android:icon="@drawable/ic_menu_mark" + android:showAsAction="ifRoom|withText" android:title="@string/map_modes" app:showAsAction="ifRoom|withText"> <menu> @@ -64,6 +68,7 @@ <item android:id="@+id/menu_theme_mode" android:icon="@drawable/ic_menu_preferences" + android:showAsAction="ifRoom|withText" android:title="@string/map_theme_select" app:showAsAction="ifRoom|withText"> </item> |