diff options
| author | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
| commit | 95e2a539517c27b3235acd582f17968c8e301e81 (patch) | |
| tree | 213bbeed798751e949376d85f4d7d0bd30c5fbfa /src/main/res/menu/verification_choices.xml | |
| parent | 48717dd7d37c066ab626fc626a2ced626ef21d42 (diff) | |
| parent | 4f4eff2353f4e359b5582c8e808a4e88631c3e74 (diff) | |
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts:
src/main/java/eu/siacs/conversations/Config.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to 'src/main/res/menu/verification_choices.xml')
| -rw-r--r-- | src/main/res/menu/verification_choices.xml | 15 |
1 files changed, 15 insertions, 0 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 |