From a81f9e4be256e77a92dd837616bbb8835deabaad Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 29 Apr 2015 17:49:52 -0700
Subject: [PATCH] [WifiSettings] Align text in Wi-Fi dialog

The themes for Wi-Fi dialog in sw600dp is outdated and causing the
labels and text fields to be misaligned. This CL removes all the
related styles except for the one in value/styles.xml, so that all
screens use the same styles (the items and values in the styles were
all the same except for sw600dp which this CL fixes).

Bug: 20663443
Change-Id: I59a079c1a4cc1ae3e99d863cb24816e609e98109
---
 res/values-land/styles.xml         | 34 ----------------------------------
 res/values-sw600dp-land/styles.xml | 34 ----------------------------------
 res/values-sw600dp/styles.xml      | 37 -------------------------------------
 res/values-sw720dp/styles.xml      | 34 ----------------------------------
 4 files changed, 139 deletions(-)

diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 974b2264b3..0903167dcd 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -18,38 +18,4 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">16sp</item>
     </style>
-
-    <style name="wifi_item">
-        <item name="android:layout_marginTop">8dip</item>
-        <item name="android:layout_marginStart">8dip</item>
-        <item name="android:layout_marginEnd">8dip</item>
-        <item name="android:paddingStart">8dip</item>
-        <item name="android:paddingEnd">8dip</item>
-        <item name="android:orientation">vertical</item>
-        <item name="android:gravity">start</item>
-    </style>
-
-    <style name="wifi_item_label">
-        <item name="android:paddingStart">8dip</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-    </style>
-
-    <style name="wifi_item_content">
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="wifi_item_edit_content">
-        <item name="android:paddingStart">4dip</item>
-        <item name="android:layout_marginStart">4dip</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="wifi_section">
-        <item name="android:orientation">vertical</item>
-    </style>
 </resources>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 1a4a40ea37..645d1fec30 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -18,38 +18,4 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">18sp</item>
     </style>
-
-    <style name="wifi_item">
-        <item name="android:layout_marginTop">8dip</item>
-        <item name="android:layout_marginStart">8dip</item>
-        <item name="android:layout_marginEnd">8dip</item>
-        <item name="android:paddingStart">8dip</item>
-        <item name="android:paddingEnd">8dip</item>
-        <item name="android:orientation">vertical</item>
-        <item name="android:gravity">start</item>
-    </style>
-
-    <style name="wifi_item_label">
-        <item name="android:paddingStart">8dip</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-    </style>
-
-    <style name="wifi_item_content">
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="wifi_item_edit_content">
-        <item name="android:paddingStart">4dip</item>
-        <item name="android:layout_marginStart">4dip</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="wifi_section">
-        <item name="android:orientation">vertical</item>
-    </style>
 </resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 8cf0e86d0d..d4282885e1 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -20,43 +20,6 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
-    <style name="wifi_item">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">8dip</item>
-        <item name="android:layout_marginStart">16dip</item>
-        <item name="android:layout_marginEnd">16dip</item>
-        <item name="android:orientation">vertical</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-
-    <style name="wifi_item_label">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">3</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="wifi_item_content">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">7</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="wifi_item_edit_content">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">7</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="wifi_section">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:orientation">vertical</item>
-    </style>
-
     <style name="setup_wizard_button">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:minWidth">208dip</item>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 1a4a40ea37..645d1fec30 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -18,38 +18,4 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">18sp</item>
     </style>
-
-    <style name="wifi_item">
-        <item name="android:layout_marginTop">8dip</item>
-        <item name="android:layout_marginStart">8dip</item>
-        <item name="android:layout_marginEnd">8dip</item>
-        <item name="android:paddingStart">8dip</item>
-        <item name="android:paddingEnd">8dip</item>
-        <item name="android:orientation">vertical</item>
-        <item name="android:gravity">start</item>
-    </style>
-
-    <style name="wifi_item_label">
-        <item name="android:paddingStart">8dip</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-    </style>
-
-    <style name="wifi_item_content">
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="wifi_item_edit_content">
-        <item name="android:paddingStart">4dip</item>
-        <item name="android:layout_marginStart">4dip</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="wifi_section">
-        <item name="android:orientation">vertical</item>
-    </style>
 </resources>
-- 
2.11.0