diff options
author | Maurice Lam <yukl@google.com> | 2015-04-30 18:25:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 18:25:20 +0000 |
commit | c531044671ee80a1615013518778ddbf2793137a (patch) | |
tree | 3454a849671c93124d2e98adfa78c5b46fbb0a34 /res | |
parent | 0063d51ca5c69479cc49467f88bbf0072e0409db (diff) | |
parent | a81f9e4be256e77a92dd837616bbb8835deabaad (diff) | |
download | packages_apps_Settings-c531044671ee80a1615013518778ddbf2793137a.tar.gz packages_apps_Settings-c531044671ee80a1615013518778ddbf2793137a.tar.bz2 packages_apps_Settings-c531044671ee80a1615013518778ddbf2793137a.zip |
Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev
Diffstat (limited to 'res')
-rw-r--r-- | res/values-land/styles.xml | 34 | ||||
-rw-r--r-- | res/values-sw600dp-land/styles.xml | 34 | ||||
-rw-r--r-- | res/values-sw600dp/styles.xml | 37 | ||||
-rw-r--r-- | res/values-sw720dp/styles.xml | 34 |
4 files changed, 0 insertions, 139 deletions
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index 974b2264b..0903167dc 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 1a4a40ea3..645d1fec3 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 8cf0e86d0..d4282885e 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 1a4a40ea3..645d1fec3 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> |