commit da52422a83536825dcc6ed9cb2255ae56ef3bfc2
author Julia Reynolds <juliacr@google.com> Fri Mar 04 21:47:55 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 04 21:47:56 2016 +0000
tree faa7b4d98b5047cda8c931f3f122a49c9a93efe4
parent 5d4ab988bd18bb1fc339f39d6f0cf225b6561903
parent aebacc94c0a315624ea5764b1da33327a5e09498

Merge "Redlines for inline settings." into nyc-dev

packages/SystemUI/res/color/notification_guts_buttons.xml

diff --git a/packages/SystemUI/res/color/notification_guts_buttons.xml b/packages/SystemUI/res/color/notification_guts_buttons.xml
new file mode 100644
index 0000000..f7a4ee9
--- /dev/null
+++ b/packages/SystemUI/res/color/notification_guts_buttons.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"
+          android:color="@*android:color/material_deep_teal_500" />
+    <item android:color="@android:color/black"
+          android:alpha=".87" />
+</selector>
\ No newline at end of file

packages/SystemUI/res/layout/notification_guts.xml

diff --git a/packages/SystemUI/res/layout/notification_guts.xml b/packages/SystemUI/res/layout/notification_guts.xml
index 4b0c834..1ab6bf9 100644
--- a/packages/SystemUI/res/layout/notification_guts.xml
+++ b/packages/SystemUI/res/layout/notification_guts.xml
@@ -63,29 +63,32 @@
             android:id="@+id/importance_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dip"
+            android:paddingTop="4dp"
+            android:paddingBottom="16dip"
             android:paddingEnd="8dp" >
         <RadioButton
                 android:id="@+id/silent_importance"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
+                android:paddingStart="32dp"
                 android:text="@string/show_silently"
-                style="@style/TextAppearance.NotificationGuts.Primary"
-                android:buttonTint="#858383" />
+                style="@style/TextAppearance.NotificationGuts.Radio"
+                android:buttonTint="@color/notification_guts_buttons" />
         <RadioButton
                 android:id="@+id/block_importance"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
+                android:paddingStart="32dp"
                 android:text="@string/block"
-                style="@style/TextAppearance.NotificationGuts.Primary"
-                android:buttonTint="#858383" />
+                style="@style/TextAppearance.NotificationGuts.Radio"
+                android:buttonTint="@color/notification_guts_buttons" />
         <RadioButton
                 android:id="@+id/reset_importance"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
-                style="@style/TextAppearance.NotificationGuts.Primary"
-                android:buttonTint="#858383" />
+                android:paddingStart="32dp"
+                style="@style/TextAppearance.NotificationGuts.Radio"
+                android:buttonTint="@color/notification_guts_buttons" />
     </RadioGroup>
     <!-- Importance slider -->
     <LinearLayout

packages/SystemUI/res/values/styles.xml

diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 11df681..89890d6 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -323,6 +323,10 @@
         <item name="android:textSize">16sp</item>
     </style>
 
+    <style name="TextAppearance.NotificationGuts.Radio">
+        <item name="android:alpha">.87</item>
+    </style>
+
     <style name="TextAppearance.NotificationGuts.Button">
         <item name="android:textSize">14sp</item>
         <item name="android:textAllCaps">true</item>