From 9f7437aa9e4d3f70263b3dda6f042be2407a2e97 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 1 Oct 2019 12:21:38 +1000 Subject: [PATCH] Implement device linking dialog --- res/layout/view_device_linking.xml | 50 +++++-- res/values/strings.xml | 10 +- .../ApplicationPreferencesActivity.java | 3 +- .../securesms/loki/DeviceLinkingDialog.kt | 127 +++++++++++++++--- 4 files changed, 162 insertions(+), 28 deletions(-) diff --git a/res/layout/view_device_linking.xml b/res/layout/view_device_linking.xml index 455a32e00e..b16429e9b1 100644 --- a/res/layout/view_device_linking.xml +++ b/res/layout/view_device_linking.xml @@ -24,7 +24,7 @@ android:textSize="20sp" android:fontFamily="sans-serif-medium" android:textAlignment="center" - android:text="@string/view_device_linking_title" /> + android:text="@string/view_device_linking_title_1" /> + android:text="@string/view_device_linking_explanation_1" /> -