diff options
| author | Daniel Sandler <dsandler@android.com> | 2014-06-05 02:54:26 -0400 |
|---|---|---|
| committer | Dan Sandler <dsandler@android.com> | 2014-06-11 13:18:59 +0000 |
| commit | c776997e876dbf066c1a93d180e39a5dc74dd7c9 (patch) | |
| tree | 95ba2825878a278c7ba94fa5ae8090973d2c5655 | |
| parent | 542588e3ba1e25a9465246a8542b1b6cbe6f9249 (diff) | |
| download | frameworks_base-c776997e876dbf066c1a93d180e39a5dc74dd7c9.zip frameworks_base-c776997e876dbf066c1a93d180e39a5dc74dd7c9.tar.gz frameworks_base-c776997e876dbf066c1a93d180e39a5dc74dd7c9.tar.bz2 | |
Clean up progress bars for media & other notifications.
Bug: 15147533
Change-Id: Ib4905203c004232bd7d78fe9fa316aa5688eaaa2
6 files changed, 6 insertions, 6 deletions
diff --git a/core/res/res/layout/notification_template_material_big_base.xml b/core/res/res/layout/notification_template_material_big_base.xml index bdf27c8..0564a8f 100644 --- a/core/res/res/layout/notification_template_material_big_base.xml +++ b/core/res/res/layout/notification_template_material_big_base.xml @@ -145,7 +145,7 @@ android:layout_marginStart="8dp" android:layout_marginEnd="8dp" android:visibility="gone" - style="@style/Widget.Material.Light.ProgressBar.Horizontal" + style="@style/Widget.StatusBar.Material.ProgressBar" /> </LinearLayout> <ImageView diff --git a/core/res/res/layout/notification_template_material_big_media.xml b/core/res/res/layout/notification_template_material_big_media.xml index c89b9f9..f8e1986 100644 --- a/core/res/res/layout/notification_template_material_big_media.xml +++ b/core/res/res/layout/notification_template_material_big_media.xml @@ -38,7 +38,6 @@ android:minHeight="@dimen/notification_large_icon_height" android:paddingTop="2dp" android:orientation="vertical" - android:background="@color/notification_media_info_bg" > <LinearLayout android:id="@+id/line1" @@ -147,7 +146,7 @@ android:layout_height="6dp" android:layout_gravity="top" android:visibility="gone" - style="@style/Widget.StatusBar.Material.ProgressBar" + style="@style/Widget.StatusBar.Material.ProgressBar.Media" /> </FrameLayout> </LinearLayout> diff --git a/core/res/res/layout/notification_template_material_big_text.xml b/core/res/res/layout/notification_template_material_big_text.xml index 6f8c3a9..1de5add 100644 --- a/core/res/res/layout/notification_template_material_big_text.xml +++ b/core/res/res/layout/notification_template_material_big_text.xml @@ -99,7 +99,7 @@ android:layout_marginEnd="8dp" android:visibility="gone" android:layout_weight="0" - style="@style/Widget.Material.Light.ProgressBar.Horizontal" + style="@style/Widget.StatusBar.Material.ProgressBar" /> <TextView android:id="@+id/big_text" android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent" diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 9bf2ce8..9f6c7ad 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -135,7 +135,6 @@ <color name="notification_action_legacy_color_filter">#ff555555</color> <color name="notification_media_action_bg">#00000000</color> - <color name="notification_media_info_bg">#40FFFFFF</color> <color name="notification_media_progress">#FFFFFFFF</color> <!-- Keyguard colors --> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index 92cce25..a40835c 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -345,6 +345,9 @@ please see styles_device_defaults.xml. </style> <style name="Widget.StatusBar.Material.ProgressBar" parent="Widget.Material.Light.ProgressBar.Horizontal"> + </style> + + <style name="Widget.StatusBar.Material.ProgressBar.Media"> <item name="android:progressDrawable">@drawable/notification_material_media_progress</item> </style> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index bfdb8a4..853df6e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1677,7 +1677,6 @@ <java-symbol type="drawable" name="notification_material_bg" /> <java-symbol type="drawable" name="notification_material_media_progress" /> <java-symbol type="color" name="notification_media_action_bg" /> - <java-symbol type="color" name="notification_media_info_bg" /> <java-symbol type="color" name="notification_media_progress" /> <java-symbol type="id" name="media_action_area" /> |