From bc09d290f8c2a5db8ec8caa12e8e321d9aa51bad Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 29 Sep 2015 03:24:27 +0200 Subject: [PATCH] enc-export: localization, and layout compatibility --- .../main/res/layout-land/qr_code_activity.xml | 39 -- .../backup_code_fragment.xml | 79 ++-- .../res/layout-xhdpi/backup_code_fragment.xml | 341 ++++++++++++++++++ OpenKeychain/src/main/res/values/strings.xml | 7 + 4 files changed, 394 insertions(+), 72 deletions(-) delete mode 100644 OpenKeychain/src/main/res/layout-land/qr_code_activity.xml rename OpenKeychain/src/main/res/{layout => layout-mdpi}/backup_code_fragment.xml (83%) create mode 100644 OpenKeychain/src/main/res/layout-xhdpi/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 @@ - - - - - - - - - - - - - - \ 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">