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

Merge "NotificationStation: Fix crash, use dark theme" into lmp-dev

Browse Source
This commit is contained in:
Christoph Studer
2014-07-15 10:13:27 +00:00
committed by Android (Google) Code Review
parent fc8202463e 9717fab53d
commit bc1889071f
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -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>

2
res/layout/notification_log_row.xml
View File

@@ -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"
>

2
res/layout/settings_main.xml
View File

@@ -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"

1
res/values/attrs.xml
View File

@@ -100,4 +100,5 @@
<attr name="switchBarMarginStart" format="dimension" />
<attr name="switchBarMarginEnd" format="dimension" />
<attr name="dashboardBackgroundColor" format="color" />
</resources>

8
res/values/themes.xml
View File

@@ -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>