aboutsummaryrefslogtreecommitdiffstats
path: root/main/res
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2014-08-14 07:50:48 +0200
committerBananeweizen <bananeweizen@gmx.de>2014-08-14 07:50:48 +0200
commit437caa0e3406dd343c77032647df7b9abcfb2960 (patch)
tree40ee06b1cb93339cd93d284663892884e6069596 /main/res
parent4bf86f923dd35761b5824d0e3cb6347db2f979ad (diff)
parente1cae3e58947f0361498ddf1b01d2a4a7cb88c7e (diff)
downloadcgeo-437caa0e3406dd343c77032647df7b9abcfb2960.zip
cgeo-437caa0e3406dd343c77032647df7b9abcfb2960.tar.gz
cgeo-437caa0e3406dd343c77032647df7b9abcfb2960.tar.bz2
Merge pull request #4154 from rsudev/issue3843_longPress
DO NOT MERGE YET: Fixes #3843, Action Bar: Secondary navigation tool?
Diffstat (limited to 'main/res')
-rw-r--r--main/res/layout/navigation_action.xml15
-rw-r--r--main/res/menu/cache_options.xml3
2 files changed, 17 insertions, 1 deletions
diff --git a/main/res/layout/navigation_action.xml b/main/res/layout/navigation_action.xml
new file mode 100644
index 0000000..ea535d7
--- /dev/null
+++ b/main/res/layout/navigation_action.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <ImageButton
+ android:id="@+id/default_navigation_action"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:scaleType="centerInside"
+ android:src="@drawable/ic_menu_compass"
+ android:background="@drawable/actionbar_button" />
+
+</LinearLayout>
diff --git a/main/res/menu/cache_options.xml b/main/res/menu/cache_options.xml
index cb32215..2e0e2bd 100644
--- a/main/res/menu/cache_options.xml
+++ b/main/res/menu/cache_options.xml
@@ -6,7 +6,8 @@
android:id="@+id/menu_default_navigation"
android:icon="@drawable/ic_menu_compass"
android:title="@string/cache_menu_navigate"
- app:showAsAction="ifRoom"> <!-- will be replaced -->
+ app:actionProviderClass="cgeo.geocaching.ui.NavigationActionProvider"
+ app:showAsAction="always"> <!-- will be replaced -->
</item>
<item
android:id="@+id/menu_navigate"