From a7a0d9dd4b545ea65444efad5ca96cb7bca919ef Mon Sep 17 00:00:00 2001
From: Lubo Viluda <lubo.viluda@gmail.com>
Date: Tue, 12 Apr 2016 15:41:42 +0200
Subject: Unnecesary code removed and string repaired

- Unnecesary import from RedirectImportKeyActivity.java removed
- ..\value-w820dp\dimens.xml was unnecesary
- \..value\dimens.xml unnecasary line
- string sources repaired
---
 .../sufficientlysecure/keychain/ui/RedirectImportKeysActivity.java  | 2 +-
 OpenKeychain/src/main/res/values-w820dp/dimens.xml                  | 6 ------
 OpenKeychain/src/main/res/values/dimens.xml                         | 1 -
 OpenKeychain/src/main/res/values/strings.xml                        | 6 +++---
 4 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/values-w820dp/dimens.xml

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RedirectImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RedirectImportKeysActivity.java
index 635cdcaef..3d929636c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RedirectImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/RedirectImportKeysActivity.java
@@ -19,7 +19,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
-import android.view.Window;
+
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.base.BaseActivity;
diff --git a/OpenKeychain/src/main/res/values-w820dp/dimens.xml b/OpenKeychain/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc81644..000000000
--- a/OpenKeychain/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 2630c407f..2aae06e2e 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -5,5 +5,4 @@
     <dimen name="big_toolbar">120dp</dimen>
     <dimen name="huge_toolbar">222dp</dimen>
     <dimen name="minus_statusbar_height">0dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 95e089275..725cd7b41 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1742,7 +1742,7 @@
     </string-array>
     <string name="redirect_import_key_title">"Import key attempt"</string>
     <string name="redirect_import_key_message">"You scanned a fingerprint with another app, please scan with Openkeychain directly to be safe"</string>
-    <string name="redirect_import_key_yes">Scan again</string>
-    <string name="redirect_import_key_no">Close</string>
-    <string name="title_activity_redirect_key">Key import redirection</string>
+    <string name="redirect_import_key_yes">"Scan again"</string>
+    <string name="redirect_import_key_no">"Close"</string>
+    <string name="title_activity_redirect_key">"Key import redirection"</string>
 </resources>
-- 
cgit v1.2.3