diff --git a/OpenKeychain/src/main/res/layout-land/qr_code_activity.xml b/OpenKeychain/src/main/res/layout-land/qr_code_activity.xml
deleted file mode 100644
index 59a733e89..000000000
--- a/OpenKeychain/src/main/res/layout-land/qr_code_activity.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml
similarity index 83%
rename from OpenKeychain/src/main/res/layout/backup_code_fragment.xml
rename to OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml
index 8454b8d40..1c2c260db 100644
--- a/OpenKeychain/src/main/res/layout/backup_code_fragment.xml
+++ b/OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml
@@ -22,7 +22,7 @@
android:padding="10dp"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
- android:text="The backup will be secured with a backup code. Write it down before you proceed!"
+ android:text="@string/backup_code_explanation"
style="?android:textAppearanceMedium"
/>
@@ -32,7 +32,7 @@
android:padding="10dp"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
- android:text="Please enter the backup code:"
+ android:text="@string/backup_code_enter"
style="?android:textAppearanceMedium"
/>
@@ -42,7 +42,7 @@
android:padding="10dp"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
- android:text="Code accepted!"
+ android:text="@string/backup_code_ok"
style="?android:textAppearanceMedium"
/>
@@ -72,11 +72,12 @@
android:id="@+id/backup_code_display_1"
android:textStyle="bold"
android:typeface="monospace"
- android:textSize="@dimen/abc_text_size_medium_material"
+ android:textSize="16dp"
style="@android:style/Widget.EditText"
android:clickable="false"
android:focusable="false"
tools:text="ABCDEF"
+ tools:ignore="SpUsage"
/>
+ tools:ignore="HardcodedText,SpUsage" />
@@ -160,6 +166,10 @@
android:layout_gravity="center_horizontal"
>
+
@@ -260,14 +277,14 @@
android:id="@+id/status_animator"
android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out"
- custom:initialView="0">
+ custom:initialView="3">
-
-
+ android:layout_gravity="center_horizontal"
+ style="?android:buttonBarStyle">
-
-
diff --git a/OpenKeychain/src/main/res/layout-xhdpi/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout-xhdpi/backup_code_fragment.xml
new file mode 100644
index 000000000..bb9d37fd5
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout-xhdpi/backup_code_fragment.xml
@@ -0,0 +1,341 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 4531de8fb..a26500824 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1644,5 +1644,12 @@
"GitHub Authorization"
"OpenKeychain API Tests"
"Overwrite"
+ The backup will be secured with a backup code. Write it down before you proceed!
+ Please enter the backup code:
+ Code accepted!
+ Ok, I wrote it down!
+ The backup code you entered is wrong!\nDid you write it down correctly?
+ Share backup
+ Save backup