From ef861375eebd9ac6cce7c0bb163380ab1c951063 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Fri, 20 Nov 2015 14:00:11 -0800
Subject: resolve merge conflicts of c10abb25f3 to cw-e-dev.

Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518
---
 res/layout/header.xml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'res/layout/header.xml')

diff --git a/res/layout/header.xml b/res/layout/header.xml
index 0e000a4d..f158e442 100644
--- a/res/layout/header.xml
+++ b/res/layout/header.xml
@@ -17,9 +17,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/actionBarSize"
-    android:background="@drawable/header_background"
-    android:gravity="center_vertical"
-    android:theme="@style/Theme.Header.Settings" >
+    android:background="?android:attr/colorPrimary"
+    android:gravity="center_vertical" >
 
     <ImageView android:id="@+id/icon"
         android:layout_width="@dimen/header_subsettings_margin_start"
@@ -31,12 +30,11 @@
         android:id="@+id/name"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_toStartOf="@+id/app_settings"
         android:layout_marginStart="@dimen/header_subsettings_margin_start"
         android:layout_alignWithParentIfMissing="true"
         android:layout_centerVertical="true"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@android:color/white"
+        android:textColor="?android:attr/textColorPrimaryInverse"
         android:textAlignment="viewStart" />
 
     <ImageView
@@ -52,11 +50,4 @@
         android:src="@drawable/ic_info"
         style="?android:attr/borderlessButtonStyle" />
 
-    <View
-        android:id="@+id/row_divider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?android:attr/listDivider" />
-
 </RelativeLayout>
-
-- 
cgit v1.2.3