diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 23:57:21 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-13 00:27:40 +0200 |
| commit | ca4774fd622131581e7f700a12594ad6fe1263b1 (patch) | |
| tree | 10ad0e6676454a435d45b7dc12d1fd9148aab6a0 /OpenKeychain/src/main/res/menu/key_view.xml | |
| parent | 073433fa747d698c6666081b2ee312062ecf2115 (diff) | |
| parent | 70d454785fc87dfaf8731a6eb7cebe3fc0056e7a (diff) | |
| download | open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.gz open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.bz2 open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.zip | |
Merge remote-tracking branch 'origin/master' into canonicalize
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/res/values/strings.xml
settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/menu/key_view.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/menu/key_view.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml index 864016801..64877d725 100644 --- a/OpenKeychain/src/main/res/menu/key_view.xml +++ b/OpenKeychain/src/main/res/menu/key_view.xml @@ -31,4 +31,10 @@ app:showAsAction="never" android:title="@string/menu_delete_key" /> + <item + android:id="@+id/menu_key_view_advanced" + app:showAsAction="never" + android:checkable="true" + android:title="@string/menu_advanced" /> + </menu>
\ No newline at end of file |