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

Commit b907affc authored by Christoph Studer's avatar Christoph Studer Committed by Android (Google) Code Review
Browse files

Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev

parents c90f95c7 aca4b25f

core/java/android/app/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -2739,9 +2739,9 @@ public class Notification implements Parcelable 
            } else {

                contentView.setViewVisibility(R.id.text2, View.GONE);

                if (hasProgress && (mProgressMax != 0 || mProgressIndeterminate)) {

                    contentView.setViewVisibility(R.id.progress, View.VISIBLE);

                    contentView.setProgressBar(

                            R.id.progress, mProgressMax, mProgress, mProgressIndeterminate);

                    contentView.setViewVisibility(R.id.progress, View.VISIBLE);

                    showLine2 = true;

                } else {

                    contentView.setViewVisibility(R.id.progress, View.GONE);

core/res/res/layout/notification_template_part_line2.xml

+2 −2
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ 
            android:visibility="gone"

            />

    </LinearLayout>

    <ProgressBar

    <ViewStub

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

        android:layout="@layout/notification_template_progressbar"

        android:layout_width="match_parent"

        android:layout_height="15dp"

        android:layout_marginEnd="8dp"

        android:visibility="gone"

        android:layout_weight="0"

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

        />

</merge>

core/res/res/layout/notification_template_progressbar.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2014 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



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

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

    />