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

Commit b505e9e3 authored by Liran Binyamin's avatar Liran Binyamin Committed by Automerger Merge Worker
Browse files

Merge "Add a field to BubbleInfo to indicate whether a bubble is important."... 

Merge "Add a field to BubbleInfo to indicate whether a bubble is important." into udc-dev am: 386848cb

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



Change-Id: Ie9c56247d8c7e5355eac1884329a2d04bf82b380
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a28d077 386848cb

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java

+2 −1
Original line number Diff line number Diff line
@@ -301,7 +301,8 @@ public class Bubble implements BubbleViewProvider { 
                getIcon(),

                getUser().getIdentifier(),

                getPackageName(),

                getTitle());

                getTitle(),

                isImportantConversation());

    }



    @Override

libs/WindowManager/Shell/src/com/android/wm/shell/common/bubbles/BubbleInfo.java

+10 −3
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ import java.util.Objects; 
 */

public class BubbleInfo implements Parcelable {



    // TODO(b/269671451): needs whether the bubble is an 'important person' or not



    private String mKey; // Same key as the Notification

    private int mFlags;  // Flags from BubbleMetadata

    @Nullable
@@ -47,9 +45,11 @@ public class BubbleInfo implements Parcelable { 
    private Icon mIcon;

    @Nullable

    private String mTitle;

    private boolean mIsImportantConversation;



    public BubbleInfo(String key, int flags, @Nullable String shortcutId, @Nullable Icon icon,

            int userId, String packageName, @Nullable String title) {

            int userId, String packageName, @Nullable String title,

            boolean isImportantConversation) {

        mKey = key;

        mFlags = flags;

        mShortcutId = shortcutId;
@@ -57,6 +57,7 @@ public class BubbleInfo implements Parcelable { 
        mUserId = userId;

        mPackageName = packageName;

        mTitle = title;

        mIsImportantConversation = isImportantConversation;

    }



    private BubbleInfo(Parcel source) {
@@ -67,6 +68,7 @@ public class BubbleInfo implements Parcelable { 
        mUserId = source.readInt();

        mPackageName = source.readString();

        mTitle = source.readString();

        mIsImportantConversation = source.readBoolean();

    }



    public String getKey() {
@@ -100,6 +102,10 @@ public class BubbleInfo implements Parcelable { 
        return mTitle;

    }



    public boolean isImportantConversation() {

        return mIsImportantConversation;

    }



    /**

     * Whether this bubble is currently being hidden from the stack.

     */
@@ -150,6 +156,7 @@ public class BubbleInfo implements Parcelable { 
        parcel.writeInt(mUserId);

        parcel.writeString(mPackageName);

        parcel.writeString(mTitle);

        parcel.writeBoolean(mIsImportantConversation);

    }



    @NonNull

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/bubbles/BubbleInfoTest.kt

+4 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ class BubbleInfoTest : ShellTestCase() { 


    @Test

    fun bubbleInfo() {

        val bubbleInfo = BubbleInfo("key", 0, "shortcut id", null, 6, "com.some.package", "title")

        val bubbleInfo =

            BubbleInfo("key", 0, "shortcut id", null, 6, "com.some.package", "title", true)

        val parcel = Parcel.obtain()

        bubbleInfo.writeToParcel(parcel, PARCELABLE_WRITE_RETURN_VALUE)

        parcel.setDataPosition(0)
@@ -45,5 +46,7 @@ class BubbleInfoTest : ShellTestCase() { 
        assertThat(bubbleInfo.userId).isEqualTo(bubbleInfoFromParcel.userId)

        assertThat(bubbleInfo.packageName).isEqualTo(bubbleInfoFromParcel.packageName)

        assertThat(bubbleInfo.title).isEqualTo(bubbleInfoFromParcel.title)

        assertThat(bubbleInfo.isImportantConversation)

            .isEqualTo(bubbleInfoFromParcel.isImportantConversation)

    }

}