PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NotificationStation theming" into lmp-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-23 20:37:39 +00:00
committed by Android (Google) Code Review
parent a79400defc 9c3f11fa05
commit 289a63f509
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/themes.xml
View File

@@ -88,15 +88,14 @@
<item name="ic_wps">@drawable/ic_wps_dark</item> <item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_light</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="@*android:actionBarSize">@dimen/actionbar_size</item>
<item name="switchBarTheme">@style/Theme.SwitchBar.Settings</item> <item name="switchBarTheme">@style/Theme.SwitchBar.Settings</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</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 --> <!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/Theme.AlertDialog</item> <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
@@ -182,8 +181,9 @@
</style> </style>
<style name="Theme.NotificationStation" parent="@android:style/Theme.Material"> <style name="Theme.NotificationStation" parent="@android:style/Theme.Material">
<item name="switchBarMarginStart">0dip</item> <!-- Redefine the ActionBar style for contentInsetStart -->
<item name="switchBarMarginEnd">0dip</item> <item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
<item name="@*android:actionBarSize">@dimen/actionbar_size</item>
<item name="preferenceBackgroundColor">@android:color/transparent</item> <item name="preferenceBackgroundColor">@android:color/transparent</item>
</style> </style>

2
src/com/android/settings/notification/NotificationStation.java
View File

@@ -48,6 +48,7 @@ import android.widget.TextView;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
@@ -141,6 +142,7 @@ public class NotificationStation extends SettingsPreferenceFragment {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
ListView listView = getListView(); ListView listView = getListView();
Utils.forceCustomPadding(listView);
mAdapter = new NotificationHistoryAdapter(mContext); mAdapter = new NotificationHistoryAdapter(mContext);
listView.setAdapter(mAdapter); listView.setAdapter(mAdapter);