diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-26 23:06:32 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-26 23:06:32 +0200 |
| commit | 8132b9ac745f6eedd4a7746f1e67358a61e9e4a7 (patch) | |
| tree | f1c8c520a449f3ef306e1e1e7e2b1bc70a3240ad /OpenKeychain/src/main/res/menu/key_list.xml | |
| parent | d8f278229352a58dbdcf49bb65538249f8c4ccc0 (diff) | |
| parent | 45722d7cfbb2996ff994b3f2143e5871c2e564ba (diff) | |
| download | open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.tar.gz open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.tar.bz2 open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.zip | |
Merge branch 'master' into ditch-appmsg
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/menu/key_list.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/menu/key_list.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml index ebb7314b8..e865df182 100644 --- a/OpenKeychain/src/main/res/menu/key_list.xml +++ b/OpenKeychain/src/main/res/menu/key_list.xml @@ -27,11 +27,6 @@ android:title="@string/menu_create_key" /> <item - android:id="@+id/menu_key_list_create_expert" - app:showAsAction="never" - android:title="@string/menu_create_key_expert" /> - - <item android:id="@+id/menu_key_list_debug_read" app:showAsAction="never" android:title="Debug / DB restore" @@ -43,4 +38,10 @@ android:title="Debug / DB backup" android:visible="false" /> + <item + android:id="@+id/menu_key_list_debug_first_time" + app:showAsAction="never" + android:title="Debug / Show first time screen" + android:visible="false" /> + </menu> |