aboutsummaryrefslogtreecommitdiffstats
path: root/main/res
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2014-05-22 19:26:59 +0200
committerBananeweizen <bananeweizen@gmx.de>2014-05-22 19:26:59 +0200
commit775a273b4b055cf2d1ebe76f67a87f02a32f422d (patch)
tree1133e9bdd3a6867a8d90367f49d250984290913a /main/res
parent86f406921842afbb045d09284c948cf221ec37fb (diff)
parent96c1780bbe2dd3943de9827d315a6271c8a21cb2 (diff)
downloadcgeo-775a273b4b055cf2d1ebe76f67a87f02a32f422d.zip
cgeo-775a273b4b055cf2d1ebe76f67a87f02a32f422d.tar.gz
cgeo-775a273b4b055cf2d1ebe76f67a87f02a32f422d.tar.bz2
Merge pull request #3892 from schwabe/fix_3884
Flatten menu in the List menu, fixes #3884
Diffstat (limited to 'main/res')
-rw-r--r--main/res/menu/cache_list_options.xml32
-rw-r--r--main/res/values/strings.xml1
2 files changed, 10 insertions, 23 deletions
diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml
index d743c71..c66af39 100644
--- a/main/res/menu/cache_list_options.xml
+++ b/main/res/menu/cache_list_options.xml
@@ -101,27 +101,15 @@
</menu>
</item>
<item
- android:id="@+id/submenu_manage_lists"
- android:icon="@drawable/ic_menu_more"
- android:title="@string/list_menu">
- <menu>
- <item
- android:id="@+id/menu_create_list"
- android:title="@string/list_menu_create">
- </item>
- <item
- android:id="@+id/menu_drop_list"
- android:title="@string/list_menu_drop">
- </item>
- <item
- android:id="@+id/menu_rename_list"
- android:title="@string/list_menu_rename">
- </item>
- <item
- android:id="@+id/menu_switch_list"
- android:title="@string/list_menu_change">
- </item>
- </menu>
+ android:id="@+id/menu_create_list"
+ android:title="@string/list_menu_create">
+ </item>
+ <item
+ android:id="@+id/menu_drop_list"
+ android:title="@string/list_menu_drop">
+ </item>
+ <item
+ android:id="@+id/menu_rename_list"
+ android:title="@string/list_menu_rename">
</item>
-
</menu> \ No newline at end of file
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 7a9194e..5957f42 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -348,7 +348,6 @@
<string name="list_menu">List</string>
<string name="list_menu_create">Create new list</string>
<string name="list_menu_drop">Drop current list</string>
- <string name="list_menu_change">Change list</string>
<string name="list_menu_rename">Rename current list</string>
<string name="list_title">Pick a list</string>
<string name="list_inbox">Stored</string>