Fix http auth dialog for Holo theme
Bug 3083992
Removed style/color overrides for majority of dialogs
in preparation for UX refresh
Change-Id: I1ff6d0271b802af1e7682c19e077d85025656c09
diff --git a/res/layout/http_authentication.xml b/res/layout/http_authentication.xml
index cc785c9..cee3a42 100644
--- a/res/layout/http_authentication.xml
+++ b/res/layout/http_authentication.xml
@@ -18,14 +18,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
- android:orientation="vertical">
+ android:orientation="vertical"
+ >
<TextView
android:id="@+id/username_view"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="18sp"
- android:textColor="@color/username_text"
android:text="@string/username"
android:gravity="left"
android:layout_marginTop="12dip"
@@ -34,8 +33,6 @@
<EditText
android:id="@+id/username_edit"
- android:textSize="18sp"
- android:textColor="@color/username_edit"
android:scrollHorizontally="true"
android:inputType="text"
android:gravity="fill_horizontal"
@@ -48,8 +45,6 @@
android:id="@+id/password_view"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="18sp"
- android:textColor="@color/password_text"
android:text="@string/password"
android:gravity="left"
android:layout_marginLeft="20dip"
@@ -57,8 +52,6 @@
<EditText
android:id="@+id/password_edit"
- android:textSize="18sp"
- android:textColor="@color/password_edit"
android:scrollHorizontally="true"
android:inputType="textPassword"
android:gravity="fill_horizontal"
diff --git a/res/layout/page_info.xml b/res/layout/page_info.xml
index 275fcf4..7feb24e 100644
--- a/res/layout/page_info.xml
+++ b/res/layout/page_info.xml
@@ -31,8 +31,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textStyle="bold"
- android:textSize="14sp"
- android:textColor="@color/white"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:layout_marginTop="12dip"
@@ -49,8 +47,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/page_info_address"
- android:textSize="14sp"
- android:textColor="@color/white"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -60,8 +56,6 @@
android:id="@+id/address"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="14sp"
- android:textColor="@color/white"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
diff --git a/res/layout/ssl_certificate.xml b/res/layout/ssl_certificate.xml
index a137d66..28f50a3 100644
--- a/res/layout/ssl_certificate.xml
+++ b/res/layout/ssl_certificate.xml
@@ -57,8 +57,6 @@
android:layout_width="wrap_content"
android:text="@string/issued_to"
android:textStyle="bold"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:layout_marginBottom="10dip" />
@@ -69,8 +67,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/common_name"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" />
@@ -79,8 +75,6 @@
android:id="@+id/to_common"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_value"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -92,8 +86,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/org_name"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" />
@@ -102,8 +94,6 @@
android:id="@+id/to_org"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_value"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -115,8 +105,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/org_unit"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" />
@@ -125,8 +113,6 @@
android:id="@+id/to_org_unit"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_value"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -139,8 +125,6 @@
android:layout_width="wrap_content"
android:text="@string/issued_by"
android:textStyle="bold"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:layout_marginBottom="10dip" />
@@ -151,8 +135,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/common_name"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" />
@@ -161,8 +143,6 @@
android:id="@+id/by_common"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_value"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -174,8 +154,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/org_name"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" />
@@ -184,8 +162,6 @@
android:id="@+id/by_org"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_value"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -197,8 +173,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/org_unit"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" />
@@ -207,8 +181,6 @@
android:id="@+id/by_org_unit"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_value"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -221,8 +193,6 @@
android:layout_width="wrap_content"
android:text="@string/validity_period"
android:textStyle="bold"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:layout_marginBottom="10dip" />
@@ -233,8 +203,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/issued_on"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" />
@@ -243,8 +211,6 @@
android:id="@+id/issued_on"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_value"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -256,8 +222,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/expires_on"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_label"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" />
@@ -266,8 +230,6 @@
android:id="@+id/expires_on"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textSize="14sp"
- android:textColor="@color/ssl_text_value"
android:gravity="left"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
diff --git a/res/layout/ssl_success.xml b/res/layout/ssl_success.xml
index e819f23..16f7f58 100644
--- a/res/layout/ssl_success.xml
+++ b/res/layout/ssl_success.xml
@@ -34,8 +34,7 @@
android:layout_width="wrap_content"
android:gravity="left"
android:layout_weight="1"
- android:textSize="18sp"
- android:textColor="@color/ssl_text_label"
+ android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginLeft="10dip"
android:layout_marginRight="20dip"
android:layout_marginBottom="12dip" />
diff --git a/res/layout/ssl_warning.xml b/res/layout/ssl_warning.xml
index 285c189..749629d 100644
--- a/res/layout/ssl_warning.xml
+++ b/res/layout/ssl_warning.xml
@@ -31,8 +31,7 @@
android:id="@+id/warning"
android:gravity="left"
android:layout_weight="1"
- android:textSize="18sp"
- android:textColor="@color/ssl_text_label"
+ android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginLeft="10dip"
android:layout_marginRight="20dip"
android:layout_marginBottom="12dip" />
diff --git a/res/layout/ssl_warnings.xml b/res/layout/ssl_warnings.xml
index 7e43256..3fe73d3 100644
--- a/res/layout/ssl_warnings.xml
+++ b/res/layout/ssl_warnings.xml
@@ -30,8 +30,7 @@
android:id="@+id/warnings_header"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:textSize="18sp"
- android:textColor="@color/ssl_text_label"
+ android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="left"
android:text="@string/ssl_warnings_header"
android:layout_marginRight="20dip"
diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml
index 37e1f2a..45af644 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -24,7 +24,8 @@
android:layout_height="56dip"
android:orientation="horizontal"
android:gravity="center_vertical"
- android:baselineAligned="false">
+ android:baselineAligned="false"
+ >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -39,16 +40,13 @@
android:layout_height="wrap_content" >
<TextView
android:id="@android:id/text1"
- style="?android:attr/dropDownItemStyle"
- android:textAppearance="?android:attr/textAppearanceMediumInverse"
+ style="@style/SuggestionLineMedium"
android:singleLine="true"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@android:id/text2"
- style="?android:attr/dropDownItemStyle"
- android:textAppearance="?android:attr/textAppearanceSmallInverse"
- android:textColor="#323232"
+ style="@style/SuggestionLineSmall"
android:singleLine="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index d6a77e0..a7e50b7 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -65,8 +65,6 @@
android:layout_width="0dip"
android:layout_weight="1.0"
android:layout_marginLeft="3dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/black"
android:gravity="center_vertical"
android:singleLine="true"
android:ellipsize="end"