Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: da52422a83

* commit 'da52422a83536825dcc6ed9cb2255ae56ef3bfc2':
  Redlines for inline settings.
This commit is contained in:
Julia Reynolds
2016-03-04 21:55:08 +00:00
committed by android-build-merger
parent 15e93f3715 da52422a83
commit 2a6646acdc
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/res/color/notification_guts_buttons.xml Normal file
View File

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

19
packages/SystemUI/res/layout/notification_guts.xml
View File

@@ -63,29 +63,32 @@
android:id="@+id/importance_buttons" android:id="@+id/importance_buttons"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:paddingTop="4dp"
android:paddingBottom="8dip" android:paddingBottom="16dip"
android:paddingEnd="8dp" > android:paddingEnd="8dp" >
<RadioButton <RadioButton
android:id="@+id/silent_importance" android:id="@+id/silent_importance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="48dp"
android:paddingStart="32dp"
android:text="@string/show_silently" android:text="@string/show_silently"
style="@style/TextAppearance.NotificationGuts.Primary" style="@style/TextAppearance.NotificationGuts.Radio"
android:buttonTint="#858383" /> android:buttonTint="@color/notification_guts_buttons" />
<RadioButton <RadioButton
android:id="@+id/block_importance" android:id="@+id/block_importance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="48dp"
android:paddingStart="32dp"
android:text="@string/block" android:text="@string/block"
style="@style/TextAppearance.NotificationGuts.Primary" style="@style/TextAppearance.NotificationGuts.Radio"
android:buttonTint="#858383" /> android:buttonTint="@color/notification_guts_buttons" />
<RadioButton <RadioButton
android:id="@+id/reset_importance" android:id="@+id/reset_importance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="48dp"
style="@style/TextAppearance.NotificationGuts.Primary" android:paddingStart="32dp"
android:buttonTint="#858383" /> style="@style/TextAppearance.NotificationGuts.Radio"
android:buttonTint="@color/notification_guts_buttons" />
</RadioGroup> </RadioGroup>
<!-- Importance slider --> <!-- Importance slider -->
<LinearLayout <LinearLayout

4
packages/SystemUI/res/values/styles.xml
View File

@@ -323,6 +323,10 @@
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="TextAppearance.NotificationGuts.Radio">
<item name="android:alpha">.87</item>
</style>
<style name="TextAppearance.NotificationGuts.Button"> <style name="TextAppearance.NotificationGuts.Button">
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textAllCaps">true</item> <item name="android:textAllCaps">true</item>