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

Commit e897fdcd authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge changes I5a807bbb,Icc3dd959 into sc-dev am: 18417de2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13904189

Change-Id: I088737dfae44fa7f0a449194753edba25963105b
parents d5487de7 18417de2

core/java/android/app/Notification.java

+11 −0
Original line number Diff line number Diff line
@@ -822,6 +822,17 @@ public class Notification implements Parcelable 
     */

    public static final int VISIBILITY_SECRET = -1;



    /**

     * @hide

     */

    @IntDef(prefix = "VISIBILITY_", value = {

            VISIBILITY_PUBLIC,

            VISIBILITY_PRIVATE,

            VISIBILITY_SECRET,

            NotificationManager.VISIBILITY_NO_OVERRIDE

    })

    public @interface NotificationVisibilityOverride{};



    /**

     * Notification category: incoming call (voice or video) or similar synchronous communication request.

     */

core/java/android/service/notification/NotificationListenerService.java

+2 −1
Original line number Diff line number Diff line
@@ -1786,7 +1786,8 @@ public abstract class NotificationListenerService extends Service { 
         * {@link NotificationListenerService.Ranking#VISIBILITY_NO_OVERRIDE} if

         * no such preference has been expressed.

         */

        public int getLockscreenVisibilityOverride() {

        public @Notification.NotificationVisibilityOverride

        int getLockscreenVisibilityOverride() {

            return mVisibilityOverride;

        }

packages/SystemUI/res/layout/notif_half_shelf.xml

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
                    android:textSize="15sp"

                    android:ellipsize="end"

                    android:maxLines="1"

                    style="@style/TextAppearance.NotificationInfo.Title" />

                    style="@style/TextAppearance.NotificationImportanceChannel" />



                <Switch

                    android:id="@+id/toggle"
@@ -80,7 +80,7 @@ 
            <View

                android:layout_width="match_parent"

                android:layout_height="1dp"

                android:background="@color/notification_channel_dialog_separator"

                android:background="?android:attr/colorAccent"

            />



            <!-- ChannelRows get added dynamically -->
@@ -90,7 +90,7 @@ 
        <View

            android:layout_width="match_parent"

            android:layout_height="1dp"

            android:background="@color/notification_channel_dialog_separator"

            android:background="?android:attr/colorAccent"

        />

        <RelativeLayout

            android:id="@+id/bottom_actions"

packages/SystemUI/res/layout/notif_half_shelf_row.xml

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
            android:textSize="14sp"

            android:ellipsize="end"

            android:maxLines="1"

            style="@style/TextAppearance.NotificationInfo.Title"

            style="@style/TextAppearance.NotificationImportanceChannel"

        />



        <TextView
@@ -67,7 +67,7 @@ 
            android:ellipsize="end"

            android:maxLines="1"

            android:layout_below="@id/channel_name"

            style="@style/TextAppearance.NotificationInfo.Secondary"

            style="@style/TextAppearance.NotificationImportanceApp"

        />

    </RelativeLayout>

packages/SystemUI/res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ 


    <color name="notification_section_header_label_color">@color/GM2_grey_900</color>

    <color name="notification_section_clear_all_btn_color">@color/GM2_grey_700</color>

    <!-- The divider view for the notification channel editor half-shelf -->

    <color name="notification_channel_dialog_separator">@color/GM2_grey_200</color>



    <color name="assist_orb_color">#ffffff</color>