summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/conversation_list_empty_view.xml4
-rw-r--r--res/layout/floating_actions.xml6
-rw-r--r--res/layout/one_pane_activity.xml4
3 files changed, 7 insertions, 7 deletions
diff --git a/res/layout/conversation_list_empty_view.xml b/res/layout/conversation_list_empty_view.xml
index c5dc31c29..f9f5c7db7 100644
--- a/res/layout/conversation_list_empty_view.xml
+++ b/res/layout/conversation_list_empty_view.xml
@@ -30,9 +30,11 @@
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/empty_text"
- android:layout_width="@dimen/empty_view_text_width"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/empty_view_space"
+ android:paddingLeft="@dimen/empty_view_space"
+ android:paddingRight="@dimen/empty_view_space"
android:fontFamily="sans-serif-light"
android:textAlignment="center"
android:textColor="#80000000"
diff --git a/res/layout/floating_actions.xml b/res/layout/floating_actions.xml
index 9984cda60..125b5d6f6 100644
--- a/res/layout/floating_actions.xml
+++ b/res/layout/floating_actions.xml
@@ -78,17 +78,13 @@
android:layout_marginLeft="@dimen/snack_bar_margin_horizontal"
android:layout_marginRight="@dimen/snack_bar_margin_horizontal"
android:paddingTop="@dimen/snack_bar_margin_vertical"
- android:paddingBottom="@dimen/snack_bar_margin_vertical"
android:textColor="@android:color/white" />
<TextView
android:id="@+id/multiline_action_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:layout_marginLeft="@dimen/snack_bar_margin_horizontal"
- android:layout_marginRight="@dimen/snack_bar_margin_horizontal"
- android:paddingTop="@dimen/snack_bar_margin_vertical"
+ android:paddingTop="8dp"
android:paddingBottom="@dimen/snack_bar_margin_vertical"
android:textAllCaps="true"
android:textColor="@color/snack_bar_action_text_color"
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"