From 39197a456562402ad42c5d78deafbbcefa024582 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 17 Jun 2012 17:48:52 +0200
Subject: - Fix last commit - Implement reading extra CA cert from file to fix
 keystore error on some mobile phones

---
 res/layout/basic_settings.xml    | 6 ++++++
 res/layout/file_dialog_main.xml  | 2 +-
 res/layout/keystore_selector.xml | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml
index d47ba20..409936e 100644
--- a/res/layout/basic_settings.xml
+++ b/res/layout/basic_settings.xml
@@ -106,6 +106,12 @@
             android:visibility="gone" >
 
             <include layout="@layout/keystore_selector" />
+
+            <TextView
+                style="@style/item"
+                android:singleLine="false"
+                android:text="@string/extracahint"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
         </LinearLayout>
 
         <LinearLayout
diff --git a/res/layout/file_dialog_main.xml b/res/layout/file_dialog_main.xml
index 2f88ffb..68af9b1 100644
--- a/res/layout/file_dialog_main.xml
+++ b/res/layout/file_dialog_main.xml
@@ -23,7 +23,7 @@
             android:id="@+id/fdButtonSelect"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/select" >
+            android:text="@string/select_file" >
         </Button>
     </LinearLayout>
 
diff --git a/res/layout/keystore_selector.xml b/res/layout/keystore_selector.xml
index 2194510..211e977 100644
--- a/res/layout/keystore_selector.xml
+++ b/res/layout/keystore_selector.xml
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:text="@string/select_certificate" />
+        android:text="@string/select" />
 
     <TextView
         android:id="@+id/title"
-- 
cgit v1.2.3