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

am 26bd8885: Clean up progress bars for media & other notifications.

Browse Source 
* commit '26bd8885f044181654bff60acdd1013d254feec7':
  Clean up progress bars for media & other notifications.
This commit is contained in:
Daniel Sandler
2014-06-11 22:16:30 +00:00
committed by Android Git Automerger
parent 5052e78949 c776997e87
commit 1a762874fa
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
core/res/res/layout/notification_template_material_big_media.xml
View File

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

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

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

1
core/res/res/values/colors.xml
View File

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

3
core/res/res/values/styles_material.xml
View File

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

1
core/res/res/values/symbols.xml
View File

@@ -1679,7 +1679,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" />