Merge "Fix NotificationStation theming" into lmp-dev

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 898274f..cc2a480 100644 (file)
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -88,15 +88,14 @@
         <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal_light</item>
 
+        <!-- Redefine the ActionBar style for contentInsetStart -->
+        <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
         <item name="@*android:actionBarSize">@dimen/actionbar_size</item>
 
         <item name="switchBarTheme">@style/Theme.SwitchBar.Settings</item>
 
         <item name="preferenceBackgroundColor">@drawable/preference_background</item>
 
-        <!-- Redefine the ActionBar style for contentInsetStart -->
-        <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
-
         <!-- For all Alert Dialogs -->
         <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
 
@@ -182,8 +181,9 @@
     </style>
 
     <style name="Theme.NotificationStation" parent="@android:style/Theme.Material">
-        <item name="switchBarMarginStart">0dip</item>
-        <item name="switchBarMarginEnd">0dip</item>
+        <!-- Redefine the ActionBar style for contentInsetStart -->
+        <item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
+        <item name="@*android:actionBarSize">@dimen/actionbar_size</item>
 
         <item name="preferenceBackgroundColor">@android:color/transparent</item>
     </style>

diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java
index 36ce8c8..8b5e150 100644 (file)
--- a/src/com/android/settings/notification/NotificationStation.java
+++ b/src/com/android/settings/notification/NotificationStation.java
@@ -48,6 +48,7 @@ import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -141,6 +142,7 @@ public class NotificationStation extends SettingsPreferenceFragment {
         super.onActivityCreated(savedInstanceState);
 
         ListView listView = getListView();
+        Utils.forceCustomPadding(listView);
 
         mAdapter = new NotificationHistoryAdapter(mContext);
         listView.setAdapter(mAdapter);