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

Merge "Added the ripple drawable back to the media notification" into nyc-dev

Browse Source
This commit is contained in:
Selim Cinek
2016-04-25 17:44:10 +00:00
committed by Android (Google) Code Review
parent 5e40748d3f cde952c461
commit 08b38f87ef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/drawable/notification_material_media_action_background.xml
View File

@@ -16,4 +16,4 @@
--> -->
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ripple_material_dark" /> android:color="@color/ripple_material_light" />

2
core/res/res/layout/notification_template_material_media.xml
View File

@@ -20,6 +20,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#00000000"
android:tag="media" android:tag="media"
> >
<include layout="@layout/notification_template_header" <include layout="@layout/notification_template_header"
@@ -29,7 +30,6 @@
android:id="@+id/notification_main_column" android:id="@+id/notification_main_column"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#00000000"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginStart="@dimen/notification_content_margin_start"
android:layout_marginTop="@dimen/notification_content_margin_top" android:layout_marginTop="@dimen/notification_content_margin_top"