aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/activity_verify_otr.xml10
-rw-r--r--src/main/res/menu/verify_otr.xml20
-rw-r--r--src/main/res/values/strings.xml3
3 files changed, 28 insertions, 5 deletions
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index d907d871..73539e0e 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -76,27 +76,27 @@
android:layout_alignParentRight="true" >
<Button
+ android:id="@+id/button_show_qr_code"
style="?android:attr/borderlessButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:visibility="invisible" />
+ android:text="@string/show_qr_code"/>
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
- android:background="@color/divider"
- android:visibility="invisible"/>
+ android:background="@color/divider" />
<Button
- android:id="@+id/button_verify_fingerprint"
+ android:id="@+id/button_scan_qr_code"
style="?android:attr/borderlessButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/verify"
+ android:text="@string/scan_qr_code"
android:textColor="@color/primarytext" />
</LinearLayout>
</RelativeLayout>
diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml
new file mode 100644
index 00000000..1d4a11b6
--- /dev/null
+++ b/src/main/res/menu/verify_otr.xml
@@ -0,0 +1,20 @@
+<?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_accounts"
+ android:orderInCategory="90"
+ android:showAsAction="never"
+ android:title="@string/action_accounts" />
+ <item
+ android:id="@+id/action_settings"
+ android:orderInCategory="100"
+ android:showAsAction="never"
+ android:title="@string/action_settings" />
+</menu> \ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index db9f95d4..2912d895 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -346,4 +346,7 @@
<string name="file_transmission_failed">file transmission failed</string>
<string name="file_deleted">The file has been deleted</string>
<string name="no_application_found_to_open_file">No application found to open file</string>
+ <string name="could_not_verify_fingerprint">Could not verify fingerprint</string>
+ <string name="manually_verify">Manually verify</string>
+ <string name="are_you_sure_verify_fingerprint">Are you sure that you want to verify your contacts OTR fingerprint?</string>
</resources>