From 9717fab53dc65ffe98c0df733b9b4a33bc154496 Mon Sep 17 00:00:00 2001
From: Christoph Studer <chstuder@google.com>
Date: Mon, 30 Jun 2014 16:10:26 +0200
Subject: [PATCH] NotificationStation: Fix crash, use dark theme

Bug: 15899979
Change-Id: Ieaa65e300cdc9cbed83b601b7a972a1e245c4961
---
 AndroidManifest.xml                 | 2 +-
 res/layout/notification_log_row.xml | 2 ++
 res/layout/settings_main.xml        | 2 +-
 res/values/attrs.xml                | 1 +
 res/values/themes.xml               | 8 ++++++++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 55736f4a704..c4f225400bf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -735,7 +735,7 @@
         </activity>
 
         <activity android:name="Settings$NotificationStationActivity"
-                android:theme="@android:style/Theme.DeviceDefault"
+                android:theme="@style/Theme.NotificationStation"
                 android:label="@string/notification_log_title"
                 android:taskAffinity="">
             <intent-filter>
diff --git a/res/layout/notification_log_row.xml b/res/layout/notification_log_row.xml
index 57f5a7949a4..cf8b112bd02 100644
--- a/res/layout/notification_log_row.xml
+++ b/res/layout/notification_log_row.xml
@@ -18,6 +18,8 @@
     android:layout_height="wrap_content"
     android:paddingBottom="6dp"
     android:paddingTop="6dp"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical"
     android:background="?android:attr/selectableItemBackground"
     >
diff --git a/res/layout/settings_main.xml b/res/layout/settings_main.xml
index 0cc018ee92d..cfd4e64736b 100644
--- a/res/layout/settings_main.xml
+++ b/res/layout/settings_main.xml
@@ -21,7 +21,7 @@
               android:orientation="vertical"
               android:layout_height="match_parent"
               android:layout_width="match_parent"
-              android:background="@color/dashboard_background_color">
+              android:background="?attr/dashboardBackgroundColor">
 
     <LinearLayout
             android:orientation="vertical"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 86cffa95ba0..a4e4d48eb1f 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -100,4 +100,5 @@
     <attr name="switchBarMarginStart" format="dimension" />
     <attr name="switchBarMarginEnd" format="dimension" />
 
+    <attr name="dashboardBackgroundColor" format="color" />
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4e806122d7b..8142bb57ae3 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -35,6 +35,7 @@
         <item name="switchBarMarginStart">0dip</item>
         <item name="switchBarMarginEnd">0dip</item>
         <item name="wifi_signal">@drawable/wifi_signal_dark</item>
+        <item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
     </style>
 
     <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
@@ -51,6 +52,7 @@
         <item name="switchBarMarginStart">0dip</item>
         <item name="switchBarMarginEnd">0dip</item>
         <item name="wifi_signal">@drawable/wifi_signal_light</item>
+        <item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
     </style>
 
     <style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -94,6 +96,7 @@
 
         <item name="switchBarMarginStart">@dimen/switchbar_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_margin_end</item>
+        <item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
@@ -161,4 +164,9 @@
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
     </style>
 
+    <style name="Theme.NotificationStation" parent="@android:style/Theme.Material">
+        <item name="switchBarMarginStart">0dip</item>
+        <item name="switchBarMarginEnd">0dip</item>
+        <item name="dashboardBackgroundColor">@android:color/transparent</item>
+    </style>
 </resources>