Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a762874 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

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

* commit '26bd8885f044181654bff60acdd1013d254feec7':
  Clean up progress bars for media & other notifications.
parents 5052e789 c776997e

core/res/res/layout/notification_template_material_big_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

core/res/res/layout/notification_template_material_big_media.xml

+1 −2
Original line number Diff line number Diff line
@@ -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>

core/res/res/layout/notification_template_material_big_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

core/res/res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -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 -->

core/res/res/values/styles_material.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>