summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/one_pane_activity.xml4
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/styles.xml8
3 files changed, 7 insertions, 8 deletions
diff --git a/res/layout/one_pane_activity.xml b/res/layout/one_pane_activity.xml
index 4726508d0..478edb9a9 100644
--- a/res/layout/one_pane_activity.xml
+++ b/res/layout/one_pane_activity.xml
@@ -16,6 +16,7 @@
-->
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -30,7 +31,8 @@
android:id="@+id/mail_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary" />
+ android:background="?attr/colorPrimary"
+ app:theme="?attr/actionBarTheme" />
<FrameLayout
android:layout_width="match_parent"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8b67dfbe3..ffb2939c5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -33,8 +33,7 @@
<!-- Conversation List Item Colors -->
<color name="senders_text_color">@color/text_color_black</color>
- <color name="subject_text_color_unread">@color/text_color_black</color>
- <color name="subject_text_color_read">@color/text_color_grey</color>
+ <color name="subject_text_color">@color/text_color_black</color>
<color name="snippet_text_color">@color/text_color_grey</color>
<color name="date_text_color_unread">@color/text_color_dark_blue</color>
<color name="date_text_color_read">@color/text_color_grey</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b3095450b..c195ddaae 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -57,14 +57,12 @@
<item name="android:hint">@string/subject_hint</item>
<item name="android:imeOptions">actionDone|flagNoExtractUi|flagNoFullscreen</item>
<item name="android:inputType">textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine|textMultiLine</item>
- <item name="android:textAlignment">viewStart</item>
<item name="android:textColorHint">@color/compose_label_hint</item>
</style>
<style name="ComposeBodyView" parent="@style/ComposeEditTextView">
<item name="android:imeOptions">flagNoFullscreen|actionDone|flagNoEnterAction</item>
<item name="android:inputType">textLongMessage|textMultiLine|textAutoCorrect|textCapSentences</item>
- <item name="android:textAlignment">viewStart</item>
<item name="android:textColorHint">@color/compose_label_hint</item>
</style>
@@ -118,7 +116,7 @@
<item name="android:layout_width">56dp</item>
<item name="android:layout_height">@dimen/compose_header_min_height</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
- <item name="android:padding">12dp</item>
+ <item name="android:padding">16dp</item>
</style>
<style name="ComposeFieldButton" parent="@style/BaseComposeFieldButton">
@@ -494,13 +492,13 @@
</style>
<style name="SubjectAppearanceUnreadStyle">
- <item name="android:textColor">@color/subject_text_color_unread</item>
+ <item name="android:textColor">@color/subject_text_color</item>
<item name="android:textStyle">bold</item>
</style>
<style name="SubjectAppearanceReadStyle">
<item name="android:fontFamily" tools:ignore="NewApi">sans-serif-light</item>
- <item name="android:textColor">@color/subject_text_color_read</item>
+ <item name="android:textColor">@color/subject_text_color</item>
</style>
<style name="NotificationSendersUnreadTextAppearance">