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

Merge \"Use colorControlHighlight for print button ripple.\" into nyc-mr1-dev

Browse Source 
am: 4e5008c4c5

Change-Id: Ide94360486909773a55734140efd3d29adfdd239
This commit is contained in:
Andrew Sapperstein
2016-07-14 00:08:21 +00:00
committed by android-build-merger
parent 05c2c22a80 4e5008c4c5
commit 69bee9bbcc
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/PrintSpooler/res/drawable/print_button.xml
View File

@@ -16,7 +16,7 @@
--> -->
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/print_button_tint_color"> android:color="?android:attr/colorControlHighlight">
<item <item
android:drawable="@drawable/print_button_background"> android:drawable="@drawable/print_button_background">
</item> </item>

2
packages/PrintSpooler/res/values/colors.xml
View File

@@ -16,8 +16,6 @@
<resources> <resources>
<color name="print_button_tint_color">#EEFF41</color>
<color name="print_preview_scrim_color">#99000000</color> <color name="print_preview_scrim_color">#99000000</color>
<color name="print_preview_background_color">#F2F1F2</color> <color name="print_preview_background_color">#F2F1F2</color>