aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-09-07 19:08:06 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-09-07 19:08:06 +0200
commit27c430e5e616d706d8a2a23d0709219fe35b3e77 (patch)
tree4925d27220fc85ecd1fdbc86d6c4d8700a40837b
parent815ee250714b2cfb7effbd02880fd688f30778b9 (diff)
parentd29403cc18fea37b1d5d4519ae8f91f92526119a (diff)
downloadcgeo-27c430e5e616d706d8a2a23d0709219fe35b3e77.zip
cgeo-27c430e5e616d706d8a2a23d0709219fe35b3e77.tar.gz
cgeo-27c430e5e616d706d8a2a23d0709219fe35b3e77.tar.bz2
Merge branch 'issue-4246' into upstream
-rw-r--r--main/res/drawable-hdpi/ic_menu_goto.pngbin0 -> 1347 bytes
-rw-r--r--main/res/drawable-ldpi/ic_menu_goto.pngbin0 -> 1317 bytes
-rw-r--r--main/res/drawable-mdpi/ic_menu_goto.pngbin0 -> 915 bytes
-rw-r--r--main/res/drawable-xhdpi/ic_menu_goto.pngbin0 -> 1744 bytes
-rw-r--r--main/res/drawable-xxhdpi/ic_menu_goto.pngbin0 -> 2899 bytes
-rw-r--r--main/res/menu/cache_list_context.xml2
-rw-r--r--main/res/menu/cache_list_options.xml4
-rw-r--r--main/res/menu/cache_options.xml2
-rw-r--r--main/res/menu/navigate_any_point_activity_options.xml2
9 files changed, 5 insertions, 5 deletions
diff --git a/main/res/drawable-hdpi/ic_menu_goto.png b/main/res/drawable-hdpi/ic_menu_goto.png
new file mode 100644
index 0000000..ca6e835
--- /dev/null
+++ b/main/res/drawable-hdpi/ic_menu_goto.png
Binary files differ
diff --git a/main/res/drawable-ldpi/ic_menu_goto.png b/main/res/drawable-ldpi/ic_menu_goto.png
new file mode 100644
index 0000000..d15ea3d
--- /dev/null
+++ b/main/res/drawable-ldpi/ic_menu_goto.png
Binary files differ
diff --git a/main/res/drawable-mdpi/ic_menu_goto.png b/main/res/drawable-mdpi/ic_menu_goto.png
new file mode 100644
index 0000000..5471f5b
--- /dev/null
+++ b/main/res/drawable-mdpi/ic_menu_goto.png
Binary files differ
diff --git a/main/res/drawable-xhdpi/ic_menu_goto.png b/main/res/drawable-xhdpi/ic_menu_goto.png
new file mode 100644
index 0000000..b925e69
--- /dev/null
+++ b/main/res/drawable-xhdpi/ic_menu_goto.png
Binary files differ
diff --git a/main/res/drawable-xxhdpi/ic_menu_goto.png b/main/res/drawable-xxhdpi/ic_menu_goto.png
new file mode 100644
index 0000000..0d2109c
--- /dev/null
+++ b/main/res/drawable-xxhdpi/ic_menu_goto.png
Binary files differ
diff --git a/main/res/menu/cache_list_context.xml b/main/res/menu/cache_list_context.xml
index bbcc014..c086709 100644
--- a/main/res/menu/cache_list_context.xml
+++ b/main/res/menu/cache_list_context.xml
@@ -9,7 +9,7 @@
</item>
<item
android:id="@+id/menu_navigate"
- android:icon="@drawable/ic_menu_mapmode"
+ android:icon="@drawable/ic_menu_goto"
android:title="@string/cache_menu_navigate"
app:showAsAction="ifRoom|withText">
</item>
diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml
index 8e337a4..7c933c0 100644
--- a/main/res/menu/cache_list_options.xml
+++ b/main/res/menu/cache_list_options.xml
@@ -48,13 +48,13 @@
</item>
<item
android:id="@+id/menu_cache_list_app"
- android:icon="@drawable/ic_menu_mapmode"
+ android:icon="@drawable/ic_menu_goto"
android:title="@null"
android:visible="false">
</item>
<item
android:id="@+id/submenu_cache_list_app"
- android:icon="@drawable/ic_menu_mapmode"
+ android:icon="@drawable/ic_menu_goto"
android:title="@string/caches_on_map"
android:visible="false">
<menu>
diff --git a/main/res/menu/cache_options.xml b/main/res/menu/cache_options.xml
index f6ca4aa..20ee9cd 100644
--- a/main/res/menu/cache_options.xml
+++ b/main/res/menu/cache_options.xml
@@ -11,7 +11,7 @@
</item>
<item
android:id="@+id/menu_navigate"
- android:icon="@drawable/ic_menu_mapmode"
+ android:icon="@drawable/ic_menu_goto"
android:title="@string/cache_menu_navigate"
app:actionProviderClass="cgeo.geocaching.apps.cache.navi.NavigationSelectionActionProvider"
app:showAsAction="ifRoom">
diff --git a/main/res/menu/navigate_any_point_activity_options.xml b/main/res/menu/navigate_any_point_activity_options.xml
index 0ed2499..d4e4b9e 100644
--- a/main/res/menu/navigate_any_point_activity_options.xml
+++ b/main/res/menu/navigate_any_point_activity_options.xml
@@ -11,7 +11,7 @@
</item>
<item
android:id="@+id/menu_navigate"
- android:icon="@drawable/ic_menu_mapmode"
+ android:icon="@drawable/ic_menu_goto"
android:title="@string/cache_menu_navigate"
app:showAsAction="ifRoom">
</item>