From bc09d290f8c2a5db8ec8caa12e8e321d9aa51bad Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 29 Sep 2015 03:24:27 +0200
Subject: enc-export: localization, and layout compatibility

---
 .../src/main/res/layout-land/qr_code_activity.xml  |  39 ---
 .../main/res/layout-mdpi/backup_code_fragment.xml  | 342 +++++++++++++++++++++
 .../main/res/layout-xhdpi/backup_code_fragment.xml | 341 ++++++++++++++++++++
 .../src/main/res/layout/backup_code_fragment.xml   | 329 --------------------
 OpenKeychain/src/main/res/values/strings.xml       |   7 +
 5 files changed, 690 insertions(+), 368 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout-land/qr_code_activity.xml
 create mode 100644 OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout-xhdpi/backup_code_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/backup_code_fragment.xml

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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/toolbar_standalone" />
-
-    <LinearLayout
-        android:layout_below="@id/toolbar_include"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/qr_code_image_layout"
-            android:transitionName="qr_code"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="32dp"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:clickable="true"
-            android:foreground="?android:attr/selectableItemBackground"
-            app:cardBackgroundColor="@android:color/white"
-            app:cardUseCompatPadding="true"
-            app:cardCornerRadius="4dp">
-
-            <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView
-                android:id="@+id/qr_code_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                app:dominantMeasurement="height"
-                app:aspectRatioEnabled="true" />
-        </android.support.v7.widget.CardView>
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml
new file mode 100644
index 000000000..1c2c260db
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="50dp">
+
+    <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:id="@+id/title_animator"
+        android:inAnimation="@anim/fade_in"
+        android:outAnimation="@anim/fade_out"
+        custom:initialView="0">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:text="@string/backup_code_explanation"
+            style="?android:textAppearanceMedium"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:text="@string/backup_code_enter"
+            style="?android:textAppearanceMedium"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:text="@string/backup_code_ok"
+            style="?android:textAppearanceMedium"
+            />
+
+    </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
+
+    <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:id="@+id/code_animator"
+        android:inAnimation="@anim/fade_in"
+        android:outAnimation="@anim/fade_out"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp"
+        custom:initialView="0">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_display_1"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                style="@android:style/Widget.EditText"
+                android:clickable="false"
+                android:focusable="false"
+                tools:text="ABCDEF"
+                tools:ignore="SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_display_2"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                style="@android:style/Widget.EditText"
+                android:clickable="false"
+                android:focusable="false"
+                tools:text="GHIJKL"
+                tools:ignore="SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_display_3"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                style="@android:style/Widget.EditText"
+                android:clickable="false"
+                android:focusable="false"
+                tools:text="MNOPQR"
+                tools:ignore="SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_display_4"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:singleLine="true"
+                style="@android:style/Widget.EditText"
+                android:clickable="false"
+                android:focusable="false"
+                tools:text="STUVWX"
+                tools:ignore="SpUsage"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            >
+
+            <!--
+            The most reliable way to correctly size these I found was to put a transparent hint on them.
+             Theoretically, this should be what the android:ems attribute is for - didn't work for me.
+            -->
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_1"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions|textCapCharacters"
+                android:hint="ABCDEF"
+                android:textColorHint="@android:color/transparent"
+                android:maxLength="6"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_2"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions|textCapCharacters"
+                android:hint="ABCDEF"
+                android:textColorHint="@android:color/transparent"
+                android:maxLength="6"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_3"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions|textCapCharacters"
+                android:hint="ABCDEF"
+                android:textColorHint="@android:color/transparent"
+                android:maxLength="6"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_4"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="16dp"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions|textCapCharacters"
+                android:hint="ABCDEF"
+                android:textColorHint="@android:color/transparent"
+                android:maxLength="6"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+        </LinearLayout>
+
+    </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
+
+    <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:id="@+id/status_animator"
+        android:inAnimation="@anim/fade_in_delayed"
+        android:outAnimation="@anim/fade_out"
+        custom:initialView="3">
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="10dp"
+            android:text="@string/btn_code_wrotedown"
+            android:padding="12dp"
+            android:id="@+id/button_backup_input"
+            style="?android:buttonBarButtonStyle"
+            />
+
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/backup_code_wrong"
+            style="?android:textAppearanceMedium"
+            />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            style="?android:buttonBarStyle">
+
+                <Button
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_margin="10dp"
+                    android:padding="12dp"
+                    android:text="@string/btn_backup_share"
+                    android:drawableLeft="@drawable/ic_share_grey_24dp"
+                    android:drawablePadding="8dp"
+                    android:id="@+id/button_backup_share"
+                    style="?android:buttonBarButtonStyle"
+                    />
+
+                <Button
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_margin="10dp"
+                    android:padding="12dp"
+                    android:text="@string/btn_backup_save"
+                    android:drawableLeft="@drawable/ic_save_grey_24dp"
+                    android:drawablePadding="8dp"
+                    android:id="@+id/button_backup_save"
+                    style="?android:buttonBarButtonStyle"
+                    />
+
+        </LinearLayout>
+
+    </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
+
+
+</LinearLayout>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="50dp">
+
+    <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:id="@+id/title_animator"
+        android:inAnimation="@anim/fade_in"
+        android:outAnimation="@anim/fade_out"
+        custom:initialView="0">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:text="@string/backup_code_explanation"
+            style="?android:textAppearanceMedium"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:text="@string/backup_code_enter"
+            style="?android:textAppearanceMedium"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:text="@string/backup_code_ok"
+            style="?android:textAppearanceMedium"
+            />
+
+    </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
+
+    <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:id="@+id/code_animator"
+        android:inAnimation="@anim/fade_in"
+        android:outAnimation="@anim/fade_out"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="15dp"
+        custom:initialView="0">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_display_1"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                style="@android:style/Widget.EditText"
+                android:clickable="false"
+                android:focusable="false"
+                tools:text="ABCDEF"
+                tools:ignore="SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_display_2"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                style="@android:style/Widget.EditText"
+                android:clickable="false"
+                android:focusable="false"
+                tools:text="GHIJKL"
+                tools:ignore="SpUsage" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_display_3"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                style="@android:style/Widget.EditText"
+                android:clickable="false"
+                android:focusable="false"
+                tools:text="MNOPQR"
+                tools:ignore="SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_display_4"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:singleLine="true"
+                style="@android:style/Widget.EditText"
+                android:clickable="false"
+                android:focusable="false"
+                tools:text="STUVWX"
+                tools:ignore="SpUsage"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            >
+
+            <!--
+            The most reliable way to correctly size these I found was to put a transparent hint on them.
+             Theoretically, this should be what the android:ems attribute is for - didn't work for me.
+            -->
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_1"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions|textCapCharacters"
+                android:hint="ABCDEF"
+                android:textColorHint="@android:color/transparent"
+                android:maxLength="6"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_2"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions|textCapCharacters"
+                android:hint="ABCDEF"
+                android:textColorHint="@android:color/transparent"
+                android:maxLength="6"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_3"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions|textCapCharacters"
+                android:hint="ABCDEF"
+                android:textColorHint="@android:color/transparent"
+                android:maxLength="6"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:text="-"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:id="@+id/backup_code_4"
+                android:textStyle="bold"
+                android:typeface="monospace"
+                android:textSize="18dp"
+                android:singleLine="true"
+                android:inputType="textNoSuggestions|textCapCharacters"
+                android:hint="ABCDEF"
+                android:textColorHint="@android:color/transparent"
+                android:maxLength="6"
+                tools:ignore="HardcodedText,SpUsage"
+                />
+
+        </LinearLayout>
+
+    </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
+
+    <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:id="@+id/status_animator"
+        android:inAnimation="@anim/fade_in_delayed"
+        android:outAnimation="@anim/fade_out"
+        custom:initialView="3">
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="10dp"
+            android:text="@string/btn_code_wrotedown"
+            android:padding="12dp"
+            android:id="@+id/button_backup_input"
+            style="?android:buttonBarButtonStyle"
+            />
+
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/backup_code_wrong"
+            style="?android:textAppearanceMedium"
+            />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            style="?android:buttonBarStyle">
+
+            <Button
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_margin="10dp"
+                android:padding="12dp"
+                android:text="@string/btn_backup_share"
+                android:drawableLeft="@drawable/ic_share_grey_24dp"
+                android:drawablePadding="8dp"
+                android:id="@+id/button_backup_share"
+                style="?android:buttonBarButtonStyle"
+                />
+
+            <Button
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_margin="10dp"
+                android:padding="12dp"
+                android:text="@string/btn_backup_save"
+                android:drawableLeft="@drawable/ic_save_grey_24dp"
+                android:drawablePadding="8dp"
+                android:id="@+id/button_backup_save"
+                style="?android:buttonBarButtonStyle"
+                />
+
+        </LinearLayout>
+
+    </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
+
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout/backup_code_fragment.xml
deleted file mode 100644
index 8454b8d40..000000000
--- a/OpenKeychain/src/main/res/layout/backup_code_fragment.xml
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:custom="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="50dp">
-
-    <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_gravity="center_horizontal"
-        android:id="@+id/title_animator"
-        android:inAnimation="@anim/fade_in"
-        android:outAnimation="@anim/fade_out"
-        custom:initialView="0">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            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!"
-            style="?android:textAppearanceMedium"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:text="Please enter the backup code:"
-            style="?android:textAppearanceMedium"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:text="Code accepted!"
-            style="?android:textAppearanceMedium"
-            />
-
-    </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
-
-    <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_gravity="center_horizontal"
-        android:id="@+id/code_animator"
-        android:inAnimation="@anim/fade_in"
-        android:outAnimation="@anim/fade_out"
-        android:layout_marginTop="15dp"
-        android:layout_marginBottom="15dp"
-        custom:initialView="0">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:id="@+id/backup_code_display_1"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                style="@android:style/Widget.EditText"
-                android:clickable="false"
-                android:focusable="false"
-                tools:text="ABCDEF"
-                />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:text="-"
-                />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:id="@+id/backup_code_display_2"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                style="@android:style/Widget.EditText"
-                android:clickable="false"
-                android:focusable="false"
-                tools:text="GHIJKL"
-                />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:text="-"
-                />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:id="@+id/backup_code_display_3"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                style="@android:style/Widget.EditText"
-                android:clickable="false"
-                android:focusable="false"
-                tools:text="MNOPQR"
-                />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:text="-"
-                />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:id="@+id/backup_code_display_4"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:singleLine="true"
-                style="@android:style/Widget.EditText"
-                android:clickable="false"
-                android:focusable="false"
-                tools:text="STUVWX"
-                />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            >
-
-            <EditText
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:id="@+id/backup_code_1"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions|textCapCharacters"
-                android:hint="ABCDEF"
-                android:textColorHint="@android:color/transparent"
-                android:maxLength="6"
-                />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:text="-"
-                />
-
-            <EditText
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:id="@+id/backup_code_2"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions|textCapCharacters"
-                android:hint="ABCDEF"
-                android:textColorHint="@android:color/transparent"
-                android:maxLength="6"
-                />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:text="-"
-                />
-
-            <EditText
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:id="@+id/backup_code_3"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions|textCapCharacters"
-                android:hint="ABCDEF"
-                android:textColorHint="@android:color/transparent"
-                android:maxLength="6"
-                />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:text="-"
-                />
-
-            <EditText
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:id="@+id/backup_code_4"
-                android:textStyle="bold"
-                android:typeface="monospace"
-                android:textSize="@dimen/abc_text_size_medium_material"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions|textCapCharacters"
-                android:hint="ABCDEF"
-                android:textColorHint="@android:color/transparent"
-                android:maxLength="6"
-                />
-
-        </LinearLayout>
-
-    </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
-
-    <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_gravity="center_horizontal"
-        android:id="@+id/status_animator"
-        android:inAnimation="@anim/fade_in_delayed"
-        android:outAnimation="@anim/fade_out"
-        custom:initialView="0">
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="10dp"
-            android:text="Ok, I wrote it down!"
-            android:padding="12dp"
-            android:id="@+id/button_backup_input"
-            style="?android:buttonBarButtonStyle"
-            />
-
-        <Space
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="The backup code you entered is wrong!\nDid you write it down correctly?"
-            style="?android:textAppearanceMedium"
-            />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="?android:buttonBarStyle">
-
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:padding="12dp"
-                    android:text="Share backup"
-                    android:drawableLeft="@drawable/ic_share_grey_24dp"
-                    android:drawablePadding="8dp"
-                    android:id="@+id/button_backup_share"
-                    style="?android:buttonBarButtonStyle"
-                    />
-
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:padding="12dp"
-                    android:text="Save backup"
-                    android:drawableLeft="@drawable/ic_save_grey_24dp"
-                    android:drawablePadding="8dp"
-                    android:id="@+id/button_backup_save"
-                    style="?android:buttonBarButtonStyle"
-                    />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
-
-
-</LinearLayout>
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 @@
     <string name="linked_webview_title_github">"GitHub Authorization"</string>
     <string name="linked_gist_description">"OpenKeychain API Tests"</string>
     <string name="snack_btn_overwrite">"Overwrite"</string>
+    <string name="backup_code_explanation">The backup will be secured with a backup code. Write it down before you proceed!</string>
+    <string name="backup_code_enter">Please enter the backup code:</string>
+    <string name="backup_code_ok">Code accepted!</string>
+    <string name="btn_code_wrotedown">Ok, I wrote it down!</string>
+    <string name="backup_code_wrong">The backup code you entered is wrong!\nDid you write it down correctly?</string>
+    <string name="btn_backup_share">Share backup</string>
+    <string name="btn_backup_save">Save backup</string>
 
 </resources>
-- 
cgit v1.2.3