Changed widget style to Quantum.

Bug: 16823227
Change-Id: I95338c08cc799596090002520976b240e5b94b9d

8 files changed, 26 insertions, 66 deletions

diff --git a/res/drawable-hdpi/ic_widget_compose_wht_24dp.png b/res/drawable-hdpi/ic_widget_compose_wht_24dp.png
new file mode 100644
index 000000000..540ab4dee
--- /dev/null
+++ b/res/drawable-hdpi/ic_widget_compose_wht_24dp.png
diff --git a/res/drawable-mdpi/ic_widget_compose_wht_24dp.png b/res/drawable-mdpi/ic_widget_compose_wht_24dp.png
new file mode 100644
index 000000000..8a2df3992
--- /dev/null
+++ b/res/drawable-mdpi/ic_widget_compose_wht_24dp.png
diff --git a/res/drawable-xhdpi/ic_widget_compose_wht_24dp.png b/res/drawable-xhdpi/ic_widget_compose_wht_24dp.png
new file mode 100644
index 000000000..48e75beee
--- /dev/null
+++ b/res/drawable-xhdpi/ic_widget_compose_wht_24dp.png
diff --git a/res/drawable-xxhdpi/ic_widget_compose_wht_24dp.png b/res/drawable-xxhdpi/ic_widget_compose_wht_24dp.png
new file mode 100644
index 000000000..24142c729
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_widget_compose_wht_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_widget_compose_wht_24dp.png b/res/drawable-xxxhdpi/ic_widget_compose_wht_24dp.png
new file mode 100644
index 000000000..d3ff0ecb6
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_widget_compose_wht_24dp.png
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index 678a90ac4..c671a8649 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -25,75 +25,36 @@
     android:layout_marginRight="@dimen/widget_margin_right"
     android:layout_marginBottom="@dimen/widget_margin_bottom"
     android:orientation="vertical">
-    <LinearLayout
+
+    <RelativeLayout
         android:id="@+id/widget_header"
         android:layout_width="match_parent"
-        android:layout_height="48sp"
-        android:orientation="horizontal"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
-        android:background="@drawable/header_bg_widget_holo"
-        android:gravity="center_vertical">
-        <ImageView
-            android:id="@+id/widget_icon"
-            android:layout_width="32dip"
-            android:layout_height="32dip"
-            android:layout_marginRight="8dip"
-            android:src="@mipmap/ic_launcher_mail" />
-        <LinearLayout
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight = "1"
-            android:layout_marginRight="8dip"
-            android:orientation="vertical">
-            <TextView
-                android:id="@+id/widget_folder"
-                style="@style/WidgetTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:freezesText="true"
-                android:includeFontPadding="false" />
-            <TextView
-                android:id="@+id/widget_account_noflip"
-                style="@style/WidgetSubtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:freezesText="true"
-                android:includeFontPadding="false"/>
-            <ViewFlipper
-                android:id="@+id/widget_account_unread_flipper"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:autoStart="true"
-                android:flipInterval="@integer/widget_account_unread_flip_ms"
-                android:visibility="gone">
-                <TextView
-                    android:id="@+id/widget_account"
-                    style="@style/WidgetSubtitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:freezesText="true"
-                    android:includeFontPadding="false"/>
-                <!-- Note: We can't set "freezesText" on the widget_unread_count view, as the
-                     launcher can restore stale data over updated data. -->
-                <TextView
-                    android:id="@+id/widget_unread_count"
-                    style="@style/WidgetSubtitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:includeFontPadding="false" />
-            </ViewFlipper>
-        </LinearLayout>
+        android:layout_height="48dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:background="@color/widget_header_bg_color">
         <ImageButton
             android:id="@+id/widget_compose"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_menu_compose_normal_holo_light"
+            android:src="@drawable/ic_widget_compose_wht_24dp"
             android:background="?android:attr/selectableItemBackground"
-            android:paddingLeft="4dip"
-            android:layout_gravity="center_vertical"
+            android:paddingLeft="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
             android:contentDescription="@string/compose" />
-    </LinearLayout>
+        <TextView
+            android:id="@+id/widget_folder"
+            style="@style/WidgetTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:freezesText="true"
+            android:layout_toLeftOf="@id/widget_compose"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:includeFontPadding="false" />
+    </RelativeLayout>
+
     <LinearLayout
         android:id="@+id/widget_configuration"
         android:layout_width="match_parent"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 490c27d20..badc661e0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -82,6 +82,9 @@
     <!-- Folder colors -->
     <color name="folder_disabled_drop_target_text_color">#999999</color>
 
+    <!-- Widget colors -->
+    <color name="widget_header_bg_color">#da4336</color>
+
     <!--  Color of the semi-transparent shadow box on attachment tiles -->
     <color name="attachment_tile_shadow_box_color">#7F000000</color>
     <!--  Color of the subtitle message in the attachment tile -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 91820d08b..8ca18b1c3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -398,11 +398,7 @@
     </style>
 
     <!-- Widget styles -->
-    <style name="WidgetTitle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse">
-        <item name="android:singleLine">true</item>
-    </style>
-
-    <style name="WidgetSubtitle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse">
+    <style name="WidgetTitle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:singleLine">true</item>
     </style>