From dd4e96bb355091c290a04703aa229ee98b27ad7f Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 12 Feb 2016 16:31:08 -0800
Subject: [PATCH] [SuwLib] Move some styles to main/v21

Move the styles to main/v21 so that even the eclair-mr1-compat and
full-support will try to resolve platform attributes instead of support
lib attributes on v21 or above.

Bug: 27152471
Change-Id: I410ae39adf052427192ada09bf7a0961b1e909d9
---
 library/main/res/values-v21/styles.xml     | 24 ++++++++++++++++++++++
 library/platform/res/values-v21/styles.xml | 24 ----------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml
index 50faf1d..fddfdc7 100644
--- a/library/main/res/values-v21/styles.xml
+++ b/library/main/res/values-v21/styles.xml
@@ -30,6 +30,30 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
 
+    <!-- GLIF Card layout (for tablets) -->
+
+    <style name="SuwGlifCardBackground">
+        <item name="android:background">?android:attr/colorPrimary</item>
+    </style>
+
+    <!-- Items styles -->
+
+    <style name="SuwItemContainer">
+        <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
+        <item name="android:paddingBottom">@dimen/suw_items_padding_vertical</item>
+        <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>
+        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>
+        <item name="android:paddingTop">@dimen/suw_items_padding_vertical</item>
+    </style>
+
+    <style name="SuwItemTitle">
+        <item name="android:textAppearance">?android:attr/textAppearanceListItem</item>
+    </style>
+
+    <style name="SuwItemSummary">
+        <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
+    </style>
+
     <!-- Navigation bar styles -->
 
     <style name="SuwNavBarButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">
diff --git a/library/platform/res/values-v21/styles.xml b/library/platform/res/values-v21/styles.xml
index 5c51493..4a5ae8d 100644
--- a/library/platform/res/values-v21/styles.xml
+++ b/library/platform/res/values-v21/styles.xml
@@ -113,28 +113,4 @@
         <item name="suwMarginSides">@dimen/suw_glif_margin_sides</item>
     </style>
 
-    <!-- GLIF Card layout (for tablets) -->
-
-    <style name="SuwGlifCardBackground">
-        <item name="android:background">?android:attr/colorPrimary</item>
-    </style>
-
-    <!-- Items styles -->
-
-    <style name="SuwItemContainer">
-        <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
-        <item name="android:paddingBottom">@dimen/suw_items_padding_vertical</item>
-        <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>
-        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>
-        <item name="android:paddingTop">@dimen/suw_items_padding_vertical</item>
-    </style>
-
-    <style name="SuwItemTitle">
-        <item name="android:textAppearance">?android:attr/textAppearanceListItem</item>
-    </style>
-
-    <style name="SuwItemSummary">
-        <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
-    </style>
-
 </resources>