Adding additional details to ssl_certificate view

Change-Id: I3da80988b749fe60174c3c8df856d714ede518ba

1 files changed, 79 insertions, 28 deletions

diff --git a/core/res/res/layout-land/ssl_certificate.xml b/core/res/res/layout-land/ssl_certificate.xml
index c3e6deb..4f8bd8e 100644
--- a/core/res/res/layout-land/ssl_certificate.xml
+++ b/core/res/res/layout-land/ssl_certificate.xml
@@ -23,6 +23,7 @@
         android:id="@+id/body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="left"
         android:orientation="vertical" >
 
         <!-- Placeholder for the success message or one or more warnings -->
@@ -43,8 +44,7 @@
             android:layout_weight="1"
             android:gravity="fill_horizontal"
             android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
-            android:layout_marginBottom="12dip" />
+            android:layout_marginRight="20dip"/>
 
         <TableLayout
             android:layout_width="match_parent"
@@ -58,7 +58,8 @@
                 android:text="@string/issued_to"
                 android:textStyle="bold"
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginTop="12dip"
                 android:layout_marginLeft="20dip"
                 android:layout_marginRight="20dip"
                 android:layout_marginBottom="7dip" />
@@ -68,12 +69,10 @@
                 <TextView
                     android:id="@+id/to_common_header"
                     android:text="@string/common_name"
-                    android:gravity="left"
                     android:layout_marginLeft="20dip" />
 
                 <TextView
                     android:id="@+id/to_common"
-                    android:gravity="left"
                     android:layout_marginLeft="10dip"
                     android:layout_marginRight="20dip"
                     android:layout_marginBottom="7dip" />
@@ -84,12 +83,10 @@
                 <TextView
                     android:id="@+id/to_org_header"
                     android:text="@string/org_name"
-                    android:gravity="left"
                     android:layout_marginLeft="20dip" />
 
                 <TextView
                     android:id="@+id/to_org"
-                    android:gravity="left"
                     android:layout_marginLeft="10dip"
                     android:layout_marginRight="20dip"
                     android:layout_marginBottom="7dip" />
@@ -100,15 +97,27 @@
                 <TextView
                     android:id="@+id/to_org_unit_header"
                     android:text="@string/org_unit"
-                    android:gravity="left"
                     android:layout_marginLeft="20dip" />
 
                 <TextView
                     android:id="@+id/to_org_unit"
-                    android:gravity="left"
                     android:layout_marginLeft="10dip"
                     android:layout_marginRight="20dip"
-                    android:layout_marginBottom="12dip" />
+                    android:layout_marginBottom="7dip" />
+            </TableRow>
+
+            <!-- Serial number: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/serial_number_header"
+                    android:text="@string/serial_number"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/serial_number"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="7dip" />
             </TableRow>
 
             <!-- Issued by: -->
@@ -117,7 +126,8 @@
                 android:text="@string/issued_by"
                 android:textStyle="bold"
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginTop="12dip"
                 android:layout_marginLeft="20dip"
                 android:layout_marginRight="20dip"
                 android:layout_marginBottom="7dip" />
@@ -127,12 +137,10 @@
                 <TextView
                     android:id="@+id/by_common_header"
                     android:text="@string/common_name"
-                    android:gravity="left"
                     android:layout_marginLeft="20dip" />
 
                 <TextView
                     android:id="@+id/by_common"
-                    android:gravity="left"
                     android:layout_marginLeft="10dip"
                     android:layout_marginRight="20dip"
                     android:layout_marginBottom="7dip" />
@@ -143,12 +151,10 @@
                 <TextView
                     android:id="@+id/by_org_header"
                     android:text="@string/org_name"
-                    android:gravity="left"
                     android:layout_marginLeft="20dip" />
 
                 <TextView
                     android:id="@+id/by_org"
-                    android:gravity="left"
                     android:layout_marginLeft="10dip"
                     android:layout_marginRight="20dip"
                     android:layout_marginBottom="7dip" />
@@ -159,24 +165,23 @@
                 <TextView
                     android:id="@+id/by_org_unit_header"
                     android:text="@string/org_unit"
-                    android:gravity="left"
                     android:layout_marginLeft="20dip" />
 
                 <TextView
                     android:id="@+id/by_org_unit"
-                    android:gravity="left"
                     android:layout_marginLeft="10dip"
                     android:layout_marginRight="20dip"
-                    android:layout_marginBottom="12dip" />
+                    android:layout_marginBottom="7dip" />
             </TableRow>
 
             <!-- Validity Dates: -->
             <TextView
                 android:id="@+id/validity_header"
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:text="@string/validity_period"
                 android:textStyle="bold"
+                android:layout_marginTop="12dip"
                 android:layout_marginLeft="20dip"
                 android:layout_marginRight="20dip"
                 android:layout_marginBottom="7dip" />
@@ -185,17 +190,15 @@
             <TableRow>
                 <TextView
                     android:id="@+id/issued_on_header"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/issued_on"
-                    android:gravity="left"
                     android:layout_marginLeft="20dip" />
 
                 <TextView
                     android:id="@+id/issued_on"
                     android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:gravity="left"
+                    android:layout_width="match_parent"
                     android:layout_marginLeft="10dip"
                     android:layout_marginRight="20dip"
                     android:layout_marginBottom="7dip" />
@@ -206,20 +209,68 @@
             <TableRow>
                 <TextView
                     android:id="@+id/expires_on_header"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/expires_on"
-                    android:gravity="left"
                     android:layout_marginLeft="20dip" />
 
                 <TextView
                     android:id="@+id/expires_on"
                     android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:gravity="left"
+                    android:layout_width="match_parent"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="7dip" />
+            </TableRow>
+
+            <!-- Fingerprints: -->
+            <TextView
+                android:id="@+id/fingerprints"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/fingerprints"
+                android:textStyle="bold"
+                android:layout_marginTop="12dip"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="7dip" />
+
+            <!-- SHA-256 fingerprint: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/sha256_fingerprint_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/sha256_fingerprint"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/sha256_fingerprint"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_marginLeft="10dip"
                     android:layout_marginRight="20dip"
-                    android:layout_marginBottom="12dip" />
+                    android:layout_marginBottom="7dip" />
+
+            </TableRow>
+
+            <!-- SHA-1 fingerprint: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/sha1_fingerprint_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/sha1_fingerprint"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/sha1_fingerprint"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="7dip" />
+
             </TableRow>
 
         </TableLayout>