summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorChristoph Studer <chstuder@google.com>2014-07-15 10:13:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-14 21:09:14 +0000
commitbc1889071ff0ecfe79cbc070b57c3301863cf26d (patch)
tree9ff4120a730dab5da4acc409879edcdc88fa4753 /res/layout
parentfc8202463e64d9e85af3c99c1d8552d4bb74b7dc (diff)
parent9717fab53dc65ffe98c0df733b9b4a33bc154496 (diff)
downloadpackages_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
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/notification_log_row.xml2
-rw-r--r--res/layout/settings_main.xml2
2 files changed, 3 insertions, 1 deletions
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"