am df489aa2: am bbe52eb9: Merge "Use 16sp Roboto Regular for pre-L in drawer." into ub-gmail-ur14-dev

* commit 'df489aa2a29d3be9b954e0d7d935b0f26caafbc1':
  Use 16sp Roboto Regular for pre-L in drawer.

5 files changed, 9 insertions, 19 deletions

diff --git a/res/layout/conversation_view_header.xml b/res/layout/conversation_view_header.xml
index 89f957491..43ddd922b 100644
--- a/res/layout/conversation_view_header.xml
+++ b/res/layout/conversation_view_header.xml
@@ -20,6 +20,7 @@
     android:id="@+id/conversation_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@android:color/white"
     android:orientation="horizontal"
     android:minHeight="88sp"
     android:paddingTop="16dp"
@@ -40,9 +41,9 @@
         android:layout_width="@dimen/conversation_header_star_size"
         android:layout_height="@dimen/conversation_header_star_size"
         android:layout_gravity="center_vertical"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:scaleType="center"
         android:visibility="invisible"
-        android:src="@drawable/star"
-        style="@style/BorderlessBackground" />
+        android:src="@drawable/star" />
 
 </com.android.mail.browse.ConversationViewHeader>
diff --git a/res/values-v21/dimen.xml b/res/values-v21/dimen.xml
index 3ed4cb905..46f5e88f5 100644
--- a/res/values-v21/dimen.xml
+++ b/res/values-v21/dimen.xml
@@ -19,4 +19,6 @@
 <resources>
     <dimen name="compose_button_margin_bottom">16dp</dimen>
     <dimen name="compose_button_margin_side">16dp</dimen>
-</resources>
\ No newline at end of file
+
+    <dimen name="drawer_item_font_size">14sp</dimen>
+</resources>
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 7c598cd9f..041609e31 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -45,10 +45,6 @@
         <item name="android:popupElevation">0dp</item>
     </style>
 
-    <style name="BorderlessBackground">
-        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
-    </style>
-
     <style name="NotificationPrimaryText">
         <item name="android:textColor">@color/text_color_black</item>
     </style>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index e084d9d7e..2c78bb127 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -116,7 +116,7 @@
     <dimen name="account_item_folder_color_width">36dip</dimen>
     <dimen name="drawer_footer_item_padding">16dp</dimen>
     <dimen name="drawer_footer_item_minimum_height">48dp</dimen>
-    <dimen name="drawer_item_font_size">14sp</dimen>
+    <dimen name="drawer_item_font_size">16sp</dimen>
     <dimen name="widget_subject_font_size">13sp</dimen>
     <dimen name="widget_date_font_size">12sp</dimen>
     <dimen name="widget_margin_top">0dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2152809e1..5e533750a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -644,18 +644,14 @@
         <item name="android:paddingRight">@dimen/folder_list_item_end_margin</item>
     </style>
 
-    <style name="FolderListItemStyle" parent="@style/FolderListItemStyleBase">
-        <item name="android:textStyle">bold</item>
-    </style>
+    <style name="FolderListItemStyle" parent="@style/FolderListItemStyleBase" />
 
     <style name="FolderListItemStyleBase">
         <item name="android:layout_marginLeft">@dimen/folder_list_item_text_start_margin</item>
         <item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item>
     </style>
 
-    <style name="DrawerFontStyle">
-        <item name="android:textStyle">bold</item>
-    </style>
+    <style name="DrawerFontStyle"/>
 
     <style name="DismissSeparatorStyle">
         <item name="android:layout_marginLeft">@dimen/dismiss_separator_padding</item>
@@ -924,9 +920,4 @@
         <item name="android:paddingRight">@dimen/account_item_name_end_padding</item>
     </style>
 
-    <!-- Overridden in v21/styles to use selectableItemBackgroundBorderless -->
-    <style name="BorderlessBackground">
-        <item name="android:background">?android:attr/selectableItemBackground</item>
-    </style>
-
 </resources>