summaryrefslogtreecommitdiffstats
path: root/chrome/android/java/res/values-v21
diff options
context:
space:
mode:
authormvanouwerkerk <mvanouwerkerk@chromium.org>2016-01-12 12:54:04 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-12 20:55:01 +0000
commit67f93313f512766863c9a0359a7d5b32489a1938 (patch)
tree94b09260af30e2e57c3f5306b7fed310e1a55e3a /chrome/android/java/res/values-v21
parent0bccf92a4df6960c8ee31826f38d61923774cf58 (diff)
downloadchromium_src-67f93313f512766863c9a0359a7d5b32489a1938.zip
chromium_src-67f93313f512766863c9a0359a7d5b32489a1938.tar.gz
chromium_src-67f93313f512766863c9a0359a7d5b32489a1938.tar.bz2
Notification custom layouts: no need to override individual items in v21.
If style items defined for v17 are not needed for v21 it is sufficient to define a style with the same name, the individual items from v17 will no longer be used. BUG=541617 Review URL: https://codereview.chromium.org/1577323002 Cr-Commit-Position: refs/heads/master@{#368981}
Diffstat (limited to 'chrome/android/java/res/values-v21')
-rw-r--r--chrome/android/java/res/values-v21/styles.xml19
1 files changed, 4 insertions, 15 deletions
diff --git a/chrome/android/java/res/values-v21/styles.xml b/chrome/android/java/res/values-v21/styles.xml
index cad7265..6e6f628 100644
--- a/chrome/android/java/res/values-v21/styles.xml
+++ b/chrome/android/java/res/values-v21/styles.xml
@@ -63,21 +63,13 @@
<!-- Web Notifications -->
<style name="WebNotificationTitle"
- parent="@android:style/TextAppearance.Material.Notification.Title">
- <item name="android:layout_marginStart">0dp</item>
- </style>
+ parent="@android:style/TextAppearance.Material.Notification.Title"/>
<style name="WebNotificationBody"
- parent="@android:style/TextAppearance.Material.Notification.Line2">
- <item name="android:layout_marginStart">0dp</item>
- </style>
+ parent="@android:style/TextAppearance.Material.Notification.Line2"/>
<style name="WebNotificationBodyBig"
- parent="@android:style/TextAppearance.Material.Notification">
- <item name="android:layout_marginStart">0dp</item>
- </style>
+ parent="@android:style/TextAppearance.Material.Notification"/>
<style name="WebNotificationOrigin"
- parent="@android:style/TextAppearance.Material.Notification.Info">
- <item name="android:layout_marginStart">0dp</item>
- </style>
+ parent="@android:style/TextAppearance.Material.Notification.Info"/>
<style name="WebNotificationTime"
parent="@android:style/TextAppearance.Material.Notification.Time"/>
<style name="WebNotificationDivider">
@@ -86,7 +78,6 @@
</style>
<style name="WebNotificationButtons">
<item name="android:layout_marginStart">-8dp</item>
- <item name="android:showDividers">none</item>
</style>
<style name="WebNotificationButton"
parent="@android:style/Widget.DeviceDefault.Light.Button.Borderless.Small">
@@ -99,10 +90,8 @@
</style>
<style name="WebNotificationLargeIcon">
<item name="android:padding">12dp</item>
- <item name="android:background">@null</item>
</style>
<style name="WebNotificationSmallIcon">
- <item name="android:alpha">1.0</item>
<item name="android:background">@drawable/web_notification_small_icon_background</item>
<item name="android:padding">3dp</item>
</style>