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

Commit 8f5f358f authored by Anthony Chen's avatar Anthony Chen
Browse files

Allow progress bar dimensions to be configured. 

Added a new dimension for the bottom margin after the notification
content if there is a progress bar. This value is needed to create a
larger space for the progress bar. If it is adjusted to be larger, than
the progress bar will appear to be further away from the notification
content.

Also add dimensions for the progress bar size. This value needs to also
override the max and min heights otherwise the max/min heights would
differ from the layout_height.

Test: booted on phone and Android Auto headunit
Bug: 33210494
Change-Id: I20011b3f79a0d3f81c6317e715d8d2310c5cd87b
parent 0941be7c

core/java/android/app/Notification.java

+2 −2
Original line number Diff line number Diff line
@@ -6724,8 +6724,8 @@ public class Notification implements Parcelable 
                // Need to clone customContent before adding, because otherwise it can no longer be

                // parceled independently of remoteViews.

                customContent = customContent.clone();

                remoteViews.removeAllViews(R.id.notification_main_column);

                remoteViews.addView(R.id.notification_main_column, customContent);

                remoteViews.removeAllViewsExceptId(R.id.notification_main_column, R.id.progress);

                remoteViews.addView(R.id.notification_main_column, customContent, 0 /* index */);

            }

            // also update the end margin if there is an image

            int endMargin = R.dimen.notification_content_margin_end;

core/java/android/widget/RemoteViews.java

+263 −143

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/layout/notification_template_material_base.xml

+9 −14
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
  ~ limitations under the License

  -->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:tag="base"

    >

    android:tag="base" >

    <include layout="@layout/notification_template_header" />

    <LinearLayout

        android:id="@+id/notification_main_column"
@@ -31,19 +31,14 @@ 
        android:layout_marginEnd="@dimen/notification_content_margin_end"

        android:layout_marginTop="@dimen/notification_content_margin_top"

        android:layout_marginBottom="@dimen/notification_content_margin_bottom"

        android:orientation="vertical"

        >

        android:orientation="vertical" >

        <include layout="@layout/notification_template_part_line1" />

        <include layout="@layout/notification_template_text" />

    </LinearLayout>

    <FrameLayout

        <include

            android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom"

        android:layout_marginStart="@dimen/notification_content_margin_start"

        android:layout_marginBottom="15dp"

        android:layout_marginEnd="@dimen/notification_content_margin_end" >

        <include layout="@layout/notification_template_progress" />

    </FrameLayout>

            android:layout_height="@dimen/notification_progress_bar_height"

            android:layout_marginTop="@dimen/notification_progress_margin_top"

            layout="@layout/notification_template_progress" />

    </LinearLayout>

    <include layout="@layout/notification_template_right_icon" />

</FrameLayout>

core/res/res/layout/notification_template_material_big_base.xml

+15 −24
Original line number Diff line number Diff line
@@ -20,51 +20,42 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:tag="big"

    >

    android:tag="big" >

    <LinearLayout

            android:id="@+id/notification_action_list_margin_target"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/notification_action_list_height"

            android:orientation="vertical"

            >

            android:orientation="vertical" >

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="top"

            >

            android:layout_gravity="top" >

            <include layout="@layout/notification_template_header" />

            <LinearLayout

                android:id="@+id/notification_main_column"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_gravity="top"

                android:layout_height="wrap_content"

                android:layout_marginStart="@dimen/notification_content_margin_start"

                android:layout_marginEnd="@dimen/notification_content_margin_end"

                android:layout_marginTop="@dimen/notification_content_margin_top"

                android:layout_marginBottom="@dimen/notification_content_margin_bottom"

                android:orientation="vertical"

                >

                android:orientation="vertical" >

                <include layout="@layout/notification_template_part_line1" />

                <include layout="@layout/notification_template_text" />

            </LinearLayout>

            <FrameLayout

                <include

                    android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="bottom"

                android:layout_marginStart="@dimen/notification_content_margin_start"

                android:layout_marginBottom="15dp"

                android:layout_marginEnd="@dimen/notification_content_margin_end">

                <include layout="@layout/notification_template_progress" />

            </FrameLayout>

                    android:layout_height="@dimen/notification_progress_bar_height"

                    android:layout_marginTop="@dimen/notification_progress_margin_top"

                    layout="@layout/notification_template_progress" />

            </LinearLayout>

            <include layout="@layout/notification_template_right_icon" />

        </FrameLayout>

        <ViewStub android:layout="@layout/notification_material_reply_text"

        <ViewStub

            android:layout="@layout/notification_material_reply_text"

            android:id="@+id/notification_material_reply_container"

            android:layout_width="match_parent"

                android:layout_height="wrap_content"

        />

            android:layout_height="wrap_content" />

    </LinearLayout>

    <include layout="@layout/notification_material_action_list" />

</FrameLayout>

core/res/res/layout/notification_template_progressbar.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@android:id/progress"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="@dimen/notification_progress_bar_height"

    style="@style/Widget.Material.Light.ProgressBar.Horizontal"

    />