Merge "Security warning dialog update"

2 files changed, 14 insertions, 73 deletions

diff --git a/res/layout/ssl_warning.xml b/res/layout/ssl_warning.xml
index 749629d..a54dfb8 100644
--- a/res/layout/ssl_warning.xml
+++ b/res/layout/ssl_warning.xml
@@ -14,27 +14,18 @@
      limitations under the License.
 -->
 
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:shrinkColumns="1"
-        android:orientation="horizontal" >
-    
-    <TableRow>
-        <ImageView
-            android:scaleType="center"
-            android:src="@drawable/ic_dialog_browser_security_bad"
-            android:layout_marginLeft="20dip"
-            android:layout_marginBottom="12dip" />
-            
-        <TextView 
-            android:id="@+id/warning"
-            android:gravity="left"
-            android:layout_weight="1"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="20dip"
-            android:layout_marginBottom="12dip" />
-    </TableRow>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/warning"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:drawableLeft="@drawable/ic_dialog_browser_security_bad"
+    android:drawablePadding="6dip"
+    android:textAppearance="?android:attr/textAppearanceSmall"
+    android:layout_marginLeft="12dip"
+    android:layout_marginRight="12dip"
+    android:minHeight="32dip"
+    android:gravity="center_vertical"
+    android:layout_marginBottom="4dip"
+    android:layout_marginTop="4dip" />
 
-</TableLayout>
diff --git a/res/layout/ssl_warnings.xml b/res/layout/ssl_warnings.xml
deleted file mode 100644
index 3fe73d3..0000000
--- a/res/layout/ssl_warnings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <!-- Warnings header -->
-        <TextView
-            android:id="@+id/warnings_header"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:gravity="left"
-            android:text="@string/ssl_warnings_header"
-            android:layout_marginRight="20dip"
-            android:layout_marginLeft="20dip"
-            android:layout_marginTop="12dip" />
-   
-        <!-- Placeholder for one or more warnings -->
-        <LinearLayout
-            android:id="@+id/placeholder"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:layout_marginTop="12dip"
-            android:orientation="vertical" />
-
-    </LinearLayout>
-
-</ScrollView>