diff options
| author | Christoph Studer <chstuder@google.com> | 2014-07-15 10:13:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-14 21:09:14 +0000 |
| commit | bc1889071ff0ecfe79cbc070b57c3301863cf26d (patch) | |
| tree | 9ff4120a730dab5da4acc409879edcdc88fa4753 | |
| parent | fc8202463e64d9e85af3c99c1d8552d4bb74b7dc (diff) | |
| parent | 9717fab53dc65ffe98c0df733b9b4a33bc154496 (diff) | |
| download | packages_apps_Settings-bc1889071ff0ecfe79cbc070b57c3301863cf26d.zip packages_apps_Settings-bc1889071ff0ecfe79cbc070b57c3301863cf26d.tar.gz packages_apps_Settings-bc1889071ff0ecfe79cbc070b57c3301863cf26d.tar.bz2 | |
Merge "NotificationStation: Fix crash, use dark theme" into lmp-dev
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/layout/notification_log_row.xml | 2 | ||||
| -rw-r--r-- | res/layout/settings_main.xml | 2 | ||||
| -rw-r--r-- | res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | res/values/themes.xml | 8 |
5 files changed, 13 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 11ae582..fac2d34 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -750,7 +750,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 57f5a79..cf8b112 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 0cc018e..cfd4e64 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 86cffa9..a4e4d48 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 4e80612..8142bb5 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> |