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

Commit 458fbcba authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add conversation-centric inline controls"

parents 2ffa2788 12ba4cf7

core/java/android/app/INotificationManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ interface INotificationManager 
    void updateNotificationChannelGroupForPackage(String pkg, int uid, in NotificationChannelGroup group);

    void updateNotificationChannelForPackage(String pkg, int uid, in NotificationChannel channel);

    NotificationChannel getNotificationChannel(String callingPkg, int userId, String pkg, String channelId);

    NotificationChannel getConversationNotificationChannel(String callingPkg, int userId, String pkg, String channelId, String conversationId);

    NotificationChannel getConversationNotificationChannel(String callingPkg, int userId, String pkg, String channelId, boolean returnParentIfNoConversationChannel, String conversationId);

    void createConversationNotificationChannelForPackage(String pkg, int uid, in NotificationChannel parentChannel, String conversationId);

    NotificationChannel getNotificationChannelForPackage(String pkg, int uid, String channelId, boolean includeDeleted);

    void deleteNotificationChannel(String pkg, String channelId);

core/java/android/app/NotificationChannel.java

+5 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.Parcelable; 
import android.provider.Settings;

import android.service.notification.NotificationListenerService;

import android.text.TextUtils;

import android.util.Log;

import android.util.proto.ProtoOutputStream;



import com.android.internal.util.Preconditions;
@@ -71,7 +72,7 @@ public final class NotificationChannel implements Parcelable { 
     * Conversation id to use for apps that aren't providing them yet.

     * @hide

     */

    public static final String PLACEHOLDER_CONVERSATION_ID = "placeholder_id";

    public static final String PLACEHOLDER_CONVERSATION_ID = ":placeholder_id";



    /**

     * The maximum length for text fields in a NotificationChannel. Fields will be truncated at this
@@ -826,8 +827,8 @@ public final class NotificationChannel implements Parcelable { 
        setBlockableSystem(safeBool(parser, ATT_BLOCKABLE_SYSTEM, false));

        setAllowBubbles(safeBool(parser, ATT_ALLOW_BUBBLE, DEFAULT_ALLOW_BUBBLE));

        setOriginalImportance(safeInt(parser, ATT_ORIG_IMP, DEFAULT_IMPORTANCE));

        setConversationId(parser.getAttributeValue(ATT_PARENT_CHANNEL, null),

                parser.getAttributeValue(ATT_CONVERSATION_ID, null));

        setConversationId(parser.getAttributeValue(null, ATT_PARENT_CHANNEL),

                parser.getAttributeValue(null, ATT_CONVERSATION_ID));

    }



    @Nullable
@@ -1175,7 +1176,7 @@ public final class NotificationChannel implements Parcelable { 
                + ", mImportanceLockedDefaultApp=" + mImportanceLockedDefaultApp

                + ", mOriginalImp=" + mOriginalImportance

                + ", mParent=" + mParentId

                + ", mConversationId" + mConversationId;

                + ", mConversationId=" + mConversationId;

    }



    /** @hide */

core/java/android/app/NotificationManager.java

+2 −1
Original line number Diff line number Diff line
@@ -855,7 +855,8 @@ public class NotificationManager { 
        INotificationManager service = getService();

        try {

            return service.getConversationNotificationChannel(mContext.getOpPackageName(),

                    mContext.getUserId(), mContext.getPackageName(), channelId, conversationId);

                    mContext.getUserId(), mContext.getPackageName(), channelId, true,

                    conversationId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationSwipeActionHelper.java

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ public interface NotificationSwipeActionHelper { 
     */

    public void snooze(StatusBarNotification sbn, SnoozeOption snoozeOption);



    public void snooze(StatusBarNotification sbn, int hours);



    public float getMinDismissVelocity();



    public boolean isDismissGesture(MotionEvent ev);

packages/SystemUI/res/drawable/ic_add_to_home.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  Copyright (C) 2020 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

  -->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M18,1.01L8,1c-1.1,0 -2,0.9 -2,2v3h2V5h10v14H8v-1H6v3c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM10,15h2V8H5v2h3.59L3,15.59 4.41,17 10,11.41V15z"/>

</vector>