aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2015-01-02 15:14:06 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2015-01-02 15:14:06 +0100
commit1988e244ef035da5ddc309c3ad587f967518509e (patch)
tree285ce0234b94519aa83e93b6c140e73bd61beeb0 /src/main/res/menu
parentf58f27a1f74ee37092aa24a1187de32fe7e903ae (diff)
some further otr improvements
Diffstat (limited to 'src/main/res/menu')
-rw-r--r--src/main/res/menu/verification_choices.xml15
-rw-r--r--src/main/res/menu/verify_otr.xml9
2 files changed, 19 insertions, 5 deletions
diff --git a/src/main/res/menu/verification_choices.xml b/src/main/res/menu/verification_choices.xml
new file mode 100644
index 00000000..e833ba79
--- /dev/null
+++ b/src/main/res/menu/verification_choices.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:id="@+id/scan_fingerprint"
+ android:title="@string/scan_qr_code"/>
+ <item
+ android:id="@+id/ask_question"
+ android:title="@string/ask_question"/>
+
+ <item
+ android:id="@+id/manual_verification"
+ android:title="@string/manually_verify" />
+
+</menu> \ No newline at end of file
diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml
index 1d4a11b6..42b66ad5 100644
--- a/src/main/res/menu/verify_otr.xml
+++ b/src/main/res/menu/verify_otr.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/manually_verify"
- android:orderInCategory="10"
- android:showAsAction="never"
- android:title="@string/manually_verify" />
+ <item
+ android:id="@+id/action_show_qr_code"
+ android:title="@string/show_qr_code"
+ android:showAsAction="never" />
<item
android:id="@+id/action_accounts"