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

Commit e5e3e0ba authored by Anna Zappone's avatar Anna Zappone Committed by Daniel Sandler
Browse files

Update PeopleTile & ConversationChannel 

Test: PeopleSpaceTileTest
Bug: 177255255
Change-Id: Idbeed20599f19d922a78a622f85a60c59e33bf59
parent 752b1e59

core/java/android/app/people/ConversationChannel.java

+36 −0
Original line number Original line Diff line number Diff line
@@ -16,12 +16,16 @@ 




package android.app.people;

package android.app.people;





import android.annotation.Nullable;

import android.app.NotificationChannel;

import android.app.NotificationChannel;

import android.app.NotificationChannelGroup;

import android.app.NotificationChannelGroup;

import android.content.pm.ShortcutInfo;

import android.content.pm.ShortcutInfo;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;





import java.util.ArrayList;

import java.util.List;



/**

/**

 * The non-customized notification channel of a conversation. It contains the information to render

 * The non-customized notification channel of a conversation. It contains the information to render

 * the conversation and allows the user to open and customize the conversation setting.

 * the conversation and allows the user to open and customize the conversation setting.
@@ -36,6 +40,8 @@ public final class ConversationChannel implements Parcelable { 
    private NotificationChannelGroup mParentNotificationChannelGroup;

    private NotificationChannelGroup mParentNotificationChannelGroup;

    private long mLastEventTimestamp;

    private long mLastEventTimestamp;

    private boolean mHasActiveNotifications;

    private boolean mHasActiveNotifications;

    private boolean mHasBirthdayToday;

    private List<ConversationStatus> mStatuses;





    public static final Creator<ConversationChannel> CREATOR = new Creator<ConversationChannel>() {

    public static final Creator<ConversationChannel> CREATOR = new Creator<ConversationChannel>() {

        @Override

        @Override
@@ -61,6 +67,21 @@ public final class ConversationChannel implements Parcelable { 
        mHasActiveNotifications = hasActiveNotifications;

        mHasActiveNotifications = hasActiveNotifications;

    }

    }





    public ConversationChannel(ShortcutInfo shortcutInfo, int uid,

            NotificationChannel parentNotificationChannel,

            NotificationChannelGroup parentNotificationChannelGroup, long lastEventTimestamp,

            boolean hasActiveNotifications, boolean hasBirthdayToday,

            List<ConversationStatus> statuses) {

        mShortcutInfo = shortcutInfo;

        mUid = uid;

        mParentNotificationChannel = parentNotificationChannel;

        mParentNotificationChannelGroup = parentNotificationChannelGroup;

        mLastEventTimestamp = lastEventTimestamp;

        mHasActiveNotifications = hasActiveNotifications;

        mHasBirthdayToday = hasBirthdayToday;

        mStatuses = statuses;

    }



    public ConversationChannel(Parcel in) {

    public ConversationChannel(Parcel in) {

        mShortcutInfo = in.readParcelable(ShortcutInfo.class.getClassLoader());

        mShortcutInfo = in.readParcelable(ShortcutInfo.class.getClassLoader());

        mUid = in.readInt();

        mUid = in.readInt();
@@ -69,6 +90,9 @@ public final class ConversationChannel implements Parcelable { 
                in.readParcelable(NotificationChannelGroup.class.getClassLoader());

                in.readParcelable(NotificationChannelGroup.class.getClassLoader());

        mLastEventTimestamp = in.readLong();

        mLastEventTimestamp = in.readLong();

        mHasActiveNotifications = in.readBoolean();

        mHasActiveNotifications = in.readBoolean();

        mHasBirthdayToday = in.readBoolean();

        mStatuses = new ArrayList<>();

        in.readParcelableList(mStatuses, ConversationStatus.class.getClassLoader());

    }

    }





    @Override

    @Override
@@ -84,6 +108,8 @@ public final class ConversationChannel implements Parcelable { 
        dest.writeParcelable(mParentNotificationChannelGroup, flags);

        dest.writeParcelable(mParentNotificationChannelGroup, flags);

        dest.writeLong(mLastEventTimestamp);

        dest.writeLong(mLastEventTimestamp);

        dest.writeBoolean(mHasActiveNotifications);

        dest.writeBoolean(mHasActiveNotifications);

        dest.writeBoolean(mHasBirthdayToday);

        dest.writeParcelableList(mStatuses, flags);

    }

    }





    public ShortcutInfo getShortcutInfo() {

    public ShortcutInfo getShortcutInfo() {
@@ -113,4 +139,14 @@ public final class ConversationChannel implements Parcelable { 
    public boolean hasActiveNotifications() {

    public boolean hasActiveNotifications() {

        return mHasActiveNotifications;

        return mHasActiveNotifications;

    }

    }



    /** Whether this conversation has a birthday today, as associated in the Contacts Database. */

    public boolean hasBirthdayToday() {

        return mHasBirthdayToday;

    }



    /** Returns statuses associated with the conversation. */

    public @Nullable List<ConversationStatus> getStatuses() {

        return mStatuses;

    }

}
 
}

packages/SystemUI/src/com/android/systemui/people/PeopleSpaceTile.java→core/java/android/app/people/PeopleSpaceTile.java

+71 −38
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2020 The Android Open Source Project

 * Copyright (C) 2021 The Android Open Source Project

 *

 *

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

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

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

 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.systemui.people;

package android.app.people;





import android.annotation.NonNull;

import android.annotation.NonNull;

import android.app.Person;

import android.app.Person;
@@ -30,6 +30,9 @@ import android.net.Uri; 
import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;





import java.util.ArrayList;

import java.util.List;



/**

/**

 * The People Space tile contains all relevant information to render a tile in People Space: namely

 * The People Space tile contains all relevant information to render a tile in People Space: namely

 * the data of any visible conversation notification associated, associated statuses, and the last

 * the data of any visible conversation notification associated, associated statuses, and the last
@@ -45,16 +48,15 @@ public class PeopleSpaceTile implements Parcelable { 
    private int mUid;

    private int mUid;

    private Uri mContactUri;

    private Uri mContactUri;

    private String mPackageName;

    private String mPackageName;

    private String mStatusText;

    private String mBirthdayText;

    private long mLastInteractionTimestamp;

    private long mLastInteractionTimestamp;

    private boolean mIsImportantConversation;

    private boolean mIsImportantConversation;

    private boolean mIsHiddenConversation;

    private String mNotificationKey;

    private String mNotificationKey;

    // TODO: add mNotificationTimestamp

    private CharSequence mNotificationContent;

    private CharSequence mNotificationContent;

    private Uri mNotificationDataUri;

    private Uri mNotificationDataUri;

    private Intent mIntent;

    private Intent mIntent;

    // TODO: add a List of the Status objects once created

    private long mNotificationTimestamp;

    private List<ConversationStatus> mStatuses;





    private PeopleSpaceTile(Builder b) {

    private PeopleSpaceTile(Builder b) {

        mId = b.mId;

        mId = b.mId;
@@ -63,14 +65,15 @@ public class PeopleSpaceTile implements Parcelable { 
        mContactUri = b.mContactUri;

        mContactUri = b.mContactUri;

        mUid = b.mUid;

        mUid = b.mUid;

        mPackageName = b.mPackageName;

        mPackageName = b.mPackageName;

        mStatusText = b.mStatusText;

        mBirthdayText = b.mBirthdayText;

        mLastInteractionTimestamp = b.mLastInteractionTimestamp;

        mLastInteractionTimestamp = b.mLastInteractionTimestamp;

        mIsImportantConversation = b.mIsImportantConversation;

        mIsImportantConversation = b.mIsImportantConversation;

        mIsHiddenConversation = b.mIsHiddenConversation;

        mNotificationKey = b.mNotificationKey;

        mNotificationKey = b.mNotificationKey;

        mNotificationContent = b.mNotificationContent;

        mNotificationContent = b.mNotificationContent;

        mNotificationDataUri = b.mNotificationDataUri;

        mNotificationDataUri = b.mNotificationDataUri;

        mIntent = b.mIntent;

        mIntent = b.mIntent;

        mNotificationTimestamp = b.mNotificationTimestamp;

        mStatuses = b.mStatuses;

    }

    }





    public String getId() {

    public String getId() {
@@ -98,8 +101,8 @@ public class PeopleSpaceTile implements Parcelable { 
        return mPackageName;

        return mPackageName;

    }

    }





    public String getStatusText() {

    public String getBirthdayText() {

        return mStatusText;

        return mBirthdayText;

    }

    }





    /** Returns the timestamp of the last interaction. */

    /** Returns the timestamp of the last interaction. */
@@ -114,13 +117,6 @@ public class PeopleSpaceTile implements Parcelable { 
        return mIsImportantConversation;

        return mIsImportantConversation;

    }

    }





    /**

     * Whether the conversation should be hidden.

     */

    public boolean isHiddenConversation() {

        return mIsHiddenConversation;

    }



    /**

    /**

     * If a notification is currently active that maps to the relevant shortcut ID, provides the

     * If a notification is currently active that maps to the relevant shortcut ID, provides the

     * associated notification's key.

     * associated notification's key.
@@ -148,20 +144,32 @@ public class PeopleSpaceTile implements Parcelable { 
        return mIntent;

        return mIntent;

    }

    }





    /** Returns the timestamp of the last notification. */

    public long getNotificationTimestamp() {

        return mNotificationTimestamp;

    }



    /** Returns the statuses associated with the tile. */

    public List<ConversationStatus> getStatuses() {

        return mStatuses;

    }



    /** Converts a {@link PeopleSpaceTile} into a {@link PeopleSpaceTile.Builder}. */

    /** Converts a {@link PeopleSpaceTile} into a {@link PeopleSpaceTile.Builder}. */

    public PeopleSpaceTile.Builder toBuilder() {

    public Builder toBuilder() {

        PeopleSpaceTile.Builder builder =

        Builder builder =

                new PeopleSpaceTile.Builder(mId, mUserName.toString(), mUserIcon, mIntent);

                new Builder(mId, mUserName.toString(), mUserIcon, mIntent);

        builder.setContactUri(mContactUri);

        builder.setContactUri(mContactUri);

        builder.setUid(mUid);

        builder.setUid(mUid);

        builder.setPackageName(mPackageName);

        builder.setPackageName(mPackageName);

        builder.setStatusText(mStatusText);

        builder.setBirthdayText(mBirthdayText);

        builder.setLastInteractionTimestamp(mLastInteractionTimestamp);

        builder.setLastInteractionTimestamp(mLastInteractionTimestamp);

        builder.setIsImportantConversation(mIsImportantConversation);

        builder.setIsImportantConversation(mIsImportantConversation);

        builder.setIsHiddenConversation(mIsHiddenConversation);

        builder.setNotificationKey(mNotificationKey);

        builder.setNotificationKey(mNotificationKey);

        builder.setNotificationContent(mNotificationContent);

        builder.setNotificationContent(mNotificationContent);

        builder.setNotificationDataUri(mNotificationDataUri);

        builder.setNotificationDataUri(mNotificationDataUri);

        builder.setIntent(mIntent);

        builder.setNotificationTimestamp(mNotificationTimestamp);

        builder.setStatuses(mStatuses);

        return builder;

        return builder;

    }

    }
@@ -173,14 +181,15 @@ public class PeopleSpaceTile implements Parcelable { 
        private Uri mContactUri;

        private Uri mContactUri;

        private int mUid;

        private int mUid;

        private String mPackageName;

        private String mPackageName;

        private String mStatusText;

        private String mBirthdayText;

        private long mLastInteractionTimestamp;

        private long mLastInteractionTimestamp;

        private boolean mIsImportantConversation;

        private boolean mIsImportantConversation;

        private boolean mIsHiddenConversation;

        private String mNotificationKey;

        private String mNotificationKey;

        private CharSequence mNotificationContent;

        private CharSequence mNotificationContent;

        private Uri mNotificationDataUri;

        private Uri mNotificationDataUri;

        private Intent mIntent;

        private Intent mIntent;

        private long mNotificationTimestamp;

        private List<ConversationStatus> mStatuses;





        /** Builder for use only if a shortcut is not available for the tile. */

        /** Builder for use only if a shortcut is not available for the tile. */

        public Builder(String id, String userName, Icon userIcon, Intent intent) {

        public Builder(String id, String userName, Icon userIcon, Intent intent) {
@@ -200,7 +209,22 @@ public class PeopleSpaceTile implements Parcelable { 
            mContactUri = getContactUri(info);

            mContactUri = getContactUri(info);

        }

        }





        private Uri getContactUri(ShortcutInfo info) {

        public Builder(ConversationChannel channel, LauncherApps launcherApps) {

            ShortcutInfo info = channel.getShortcutInfo();

            mId = info.getId();

            mUserName = info.getLabel();

            mUserIcon = convertDrawableToIcon(launcherApps.getShortcutIconDrawable(info, 0));

            mUid = info.getUserId();

            mPackageName = info.getPackage();

            mContactUri = getContactUri(info);

            mStatuses = channel.getStatuses();

            mLastInteractionTimestamp = channel.getLastEventTimestamp();

            mIsImportantConversation = channel.getParentNotificationChannel() != null

                    && channel.getParentNotificationChannel().isImportantConversation();

        }



        /** Returns the Contact's Uri if present. */

        public Uri getContactUri(ShortcutInfo info) {

            if (info.getPersons() == null || info.getPersons().length != 1) {

            if (info.getPersons() == null || info.getPersons().length != 1) {

                return null;

                return null;

            }

            }
@@ -246,8 +270,8 @@ public class PeopleSpaceTile implements Parcelable { 
        }

        }





        /** Sets the status text. */

        /** Sets the status text. */

        public Builder setStatusText(String statusText) {

        public Builder setBirthdayText(String birthdayText) {

            mStatusText = statusText;

            mBirthdayText = birthdayText;

            return this;

            return this;

        }

        }
@@ -263,12 +287,6 @@ public class PeopleSpaceTile implements Parcelable { 
            return this;

            return this;

        }

        }





        /** Sets whether the conversation is hidden. */

        public Builder setIsHiddenConversation(boolean isHiddenConversation) {

            mIsHiddenConversation = isHiddenConversation;

            return this;

        }



        /** Sets the associated notification's key. */

        /** Sets the associated notification's key. */

        public Builder setNotificationKey(String notificationKey) {

        public Builder setNotificationKey(String notificationKey) {

            mNotificationKey = notificationKey;

            mNotificationKey = notificationKey;
@@ -293,6 +311,18 @@ public class PeopleSpaceTile implements Parcelable { 
            return this;

            return this;

        }

        }





        /** Sets the notification timestamp. */

        public Builder setNotificationTimestamp(long notificationTimestamp) {

            mNotificationTimestamp = notificationTimestamp;

            return this;

        }



        /** Sets the statuses. */

        public Builder setStatuses(List<ConversationStatus> statuses) {

            mStatuses = statuses;

            return this;

        }



        /** Builds a {@link PeopleSpaceTile}. */

        /** Builds a {@link PeopleSpaceTile}. */

        @NonNull

        @NonNull

        public PeopleSpaceTile build() {

        public PeopleSpaceTile build() {
@@ -300,21 +330,23 @@ public class PeopleSpaceTile implements Parcelable { 
        }

        }

    }

    }





    private PeopleSpaceTile(Parcel in) {

    public PeopleSpaceTile(Parcel in) {

        mId = in.readString();

        mId = in.readString();

        mUserName = in.readCharSequence();

        mUserName = in.readCharSequence();

        mUserIcon = in.readParcelable(Icon.class.getClassLoader());

        mUserIcon = in.readParcelable(Icon.class.getClassLoader());

        mContactUri = in.readParcelable(Uri.class.getClassLoader());

        mContactUri = in.readParcelable(Uri.class.getClassLoader());

        mUid = in.readInt();

        mUid = in.readInt();

        mPackageName = in.readString();

        mPackageName = in.readString();

        mStatusText = in.readString();

        mBirthdayText = in.readString();

        mLastInteractionTimestamp = in.readLong();

        mLastInteractionTimestamp = in.readLong();

        mIsImportantConversation = in.readBoolean();

        mIsImportantConversation = in.readBoolean();

        mIsHiddenConversation = in.readBoolean();

        mNotificationKey = in.readString();

        mNotificationKey = in.readString();

        mNotificationContent = in.readCharSequence();

        mNotificationContent = in.readCharSequence();

        mNotificationDataUri = in.readParcelable(Uri.class.getClassLoader());

        mNotificationDataUri = in.readParcelable(Uri.class.getClassLoader());

        mIntent = in.readParcelable(Intent.class.getClassLoader());

        mIntent = in.readParcelable(Intent.class.getClassLoader());

        mNotificationTimestamp = in.readLong();

        mStatuses = new ArrayList<>();

        in.readParcelableList(mStatuses, ConversationStatus.class.getClassLoader());

    }

    }





    @Override

    @Override
@@ -330,14 +362,15 @@ public class PeopleSpaceTile implements Parcelable { 
        dest.writeParcelable(mContactUri, flags);

        dest.writeParcelable(mContactUri, flags);

        dest.writeInt(mUid);

        dest.writeInt(mUid);

        dest.writeString(mPackageName);

        dest.writeString(mPackageName);

        dest.writeString(mStatusText);

        dest.writeString(mBirthdayText);

        dest.writeLong(mLastInteractionTimestamp);

        dest.writeLong(mLastInteractionTimestamp);

        dest.writeBoolean(mIsImportantConversation);

        dest.writeBoolean(mIsImportantConversation);

        dest.writeBoolean(mIsHiddenConversation);

        dest.writeString(mNotificationKey);

        dest.writeString(mNotificationKey);

        dest.writeCharSequence(mNotificationContent);

        dest.writeCharSequence(mNotificationContent);

        dest.writeParcelable(mNotificationDataUri, flags);

        dest.writeParcelable(mNotificationDataUri, flags);

        dest.writeParcelable(mIntent, flags);

        dest.writeParcelable(mIntent, flags);

        dest.writeLong(mNotificationTimestamp);

        dest.writeParcelableList(mStatuses, flags);

    }

    }





    public static final @android.annotation.NonNull

    public static final @android.annotation.NonNull

packages/SystemUI/tests/src/com/android/systemui/people/PeopleSpaceTileTest.java→core/tests/coretests/src/android/app/people/PeopleSpaceTileTest.java

+86 −11
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.systemui.people;

package android.app.people;





import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertThat;
@@ -25,6 +25,8 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;





import android.app.NotificationChannel;

import android.app.NotificationManager;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.pm.LauncherApps;

import android.content.pm.LauncherApps;
@@ -34,13 +36,13 @@ import android.graphics.drawable.ColorDrawable; 
import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Icon;

import android.graphics.drawable.Icon;

import android.net.Uri;

import android.net.Uri;

import android.os.Parcel;





import androidx.test.InstrumentationRegistry;

import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;





import com.android.systemui.SysuiTestCase;

import com.google.common.collect.ImmutableList;

import com.android.systemui.people.PeopleSpaceTile;





import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

import org.junit.Test;
@@ -48,10 +50,13 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.MockitoAnnotations;





import java.util.List;



@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

@SmallTest

@SmallTest

public class PeopleSpaceTileTest extends SysuiTestCase {

public class PeopleSpaceTileTest {





    private Context mContext;

    private final Drawable mDrawable = new ColorDrawable(Color.BLUE);

    private final Drawable mDrawable = new ColorDrawable(Color.BLUE);

    private final Icon mIcon = PeopleSpaceTile.convertDrawableToIcon(mDrawable);

    private final Icon mIcon = PeopleSpaceTile.convertDrawableToIcon(mDrawable);
@@ -60,6 +65,7 @@ public class PeopleSpaceTileTest extends SysuiTestCase { 




    @Before

    @Before

    public void setUp() {

    public void setUp() {

        mContext = InstrumentationRegistry.getContext();

        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);

        when(mLauncherApps.getShortcutIconDrawable(any(), eq(0))).thenReturn(mDrawable);

        when(mLauncherApps.getShortcutIconDrawable(any(), eq(0))).thenReturn(mDrawable);

    }

    }
@@ -132,7 +138,7 @@ public class PeopleSpaceTileTest extends SysuiTestCase { 
        PeopleSpaceTile tile = new PeopleSpaceTile.Builder(

        PeopleSpaceTile tile = new PeopleSpaceTile.Builder(

                new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps).build();

                new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps).build();

        // Automatically added by creating a ShortcutInfo.

        // Automatically added by creating a ShortcutInfo.

        assertThat(tile.getPackageName()).isEqualTo("com.android.systemui.tests");

        assertThat(tile.getPackageName()).isEqualTo("com.android.frameworks.coretests");





        tile = new PeopleSpaceTile.Builder(

        tile = new PeopleSpaceTile.Builder(

                new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps).setPackageName(

                new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps).setPackageName(
@@ -171,16 +177,85 @@ public class PeopleSpaceTileTest extends SysuiTestCase { 
    }

    }





    @Test

    @Test

    public void testHiddenConversation() {

    public void testStatuses() {

        PeopleSpaceTile tile = new PeopleSpaceTile.Builder(

        PeopleSpaceTile tile = new PeopleSpaceTile.Builder(

                new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps).build();

                new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps).build();

        assertFalse(tile.isHiddenConversation());

        assertThat(tile.getStatuses()).isNull();





        List<ConversationStatus> statusList = ImmutableList.of(

                new ConversationStatus.Builder("id", ConversationStatus.ACTIVITY_BIRTHDAY).build());

        tile = new PeopleSpaceTile

        tile = new PeopleSpaceTile

                .Builder(new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps)

                .Builder(new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps)

                .setIsHiddenConversation(true)

                .setStatuses(statusList)

                .build();

                .build();

        assertTrue(tile.isHiddenConversation());

        assertThat(tile.getStatuses()).isEqualTo(statusList);

    }



    @Test

    public void testCreateFromConversationChannel() {

        ShortcutInfo shortcutInfo = new ShortcutInfo.Builder(mContext, "123").setLongLabel(

                "name").build();

        ConversationChannel convo = new ConversationChannel(shortcutInfo, 0, null, null,

                0L, false, true, null);

        PeopleSpaceTile tile = new PeopleSpaceTile.Builder(convo, mLauncherApps).build();

        assertThat(tile.getStatuses()).isNull();

        assertThat(tile.getId()).isEqualTo("123");

        assertThat(tile.getUserName()).isEqualTo("name");

        assertFalse(tile.isImportantConversation());

        assertThat(tile.getLastInteractionTimestamp()).isEqualTo(0L);



        List<ConversationStatus> statuses = ImmutableList.of(

                new ConversationStatus.Builder("id", ConversationStatus.ACTIVITY_BIRTHDAY).build());

        NotificationChannel notificationChannel = new NotificationChannel("123",

                "channel",

                NotificationManager.IMPORTANCE_DEFAULT);

        notificationChannel.setImportantConversation(true);

        convo = new ConversationChannel(shortcutInfo, 0, notificationChannel, null,

                123L, false, true, statuses);

        tile = new PeopleSpaceTile.Builder(convo, mLauncherApps).build();

        assertThat(tile.getStatuses()).isEqualTo(statuses);

        assertTrue(tile.isImportantConversation());

        assertThat(tile.getLastInteractionTimestamp()).isEqualTo(123L);

    }



    @Test

    public void testWriteThenReadFromParcel() {

        List<ConversationStatus> statusList = ImmutableList.of(

                new ConversationStatus.Builder("id", ConversationStatus.ACTIVITY_BIRTHDAY).build());

        PeopleSpaceTile tile = new PeopleSpaceTile.Builder(

                new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps)

                .setUserName("name")

                .setUserIcon(mIcon)

                .setContactUri(Uri.parse("contact"))

                .setUid(42)

                .setPackageName("package.name")

                .setLastInteractionTimestamp(7L)

                .setIsImportantConversation(true)

                .setStatuses(statusList).setNotificationKey("key")

                .setNotificationContent("content")

                .setNotificationDataUri(Uri.parse("data"))

                .setIntent(new Intent())

                .build();



        Parcel parcel = Parcel.obtain();

        tile.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        PeopleSpaceTile readTile = PeopleSpaceTile.CREATOR.createFromParcel(parcel);



        assertThat(readTile.getId()).isEqualTo(tile.getId());

        assertThat(readTile.getUserName()).isEqualTo(tile.getUserName());

        assertThat(readTile.getUserIcon().toString()).isEqualTo(tile.getUserIcon().toString());

        assertThat(readTile.getContactUri()).isEqualTo(tile.getContactUri());

        assertThat(readTile.getUid()).isEqualTo(tile.getUid());

        assertThat(readTile.getPackageName()).isEqualTo(tile.getPackageName());

        assertThat(readTile.getLastInteractionTimestamp()).isEqualTo(

                tile.getLastInteractionTimestamp());

        assertThat(readTile.isImportantConversation()).isEqualTo(tile.isImportantConversation());

        assertThat(readTile.getStatuses()).isEqualTo(tile.getStatuses());

        assertThat(readTile.getNotificationKey()).isEqualTo(tile.getNotificationKey());

        assertThat(readTile.getNotificationContent()).isEqualTo(tile.getNotificationContent());

        assertThat(readTile.getNotificationDataUri()).isEqualTo(tile.getNotificationDataUri());

        assertThat(readTile.getIntent().toString()).isEqualTo(tile.getIntent().toString());

    }

    }





    @Test

    @Test

packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID; 
import android.app.Activity;

import android.app.Activity;

import android.app.INotificationManager;

import android.app.INotificationManager;

import android.app.people.IPeopleManager;

import android.app.people.IPeopleManager;

import android.app.people.PeopleSpaceTile;

import android.appwidget.AppWidgetManager;

import android.appwidget.AppWidgetManager;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;
@@ -134,8 +135,10 @@ public class PeopleSpaceActivity extends Activity { 
                    + tile.getId() + " for widget ID: "

                    + tile.getId() + " for widget ID: "

                    + mAppWidgetId);

                    + mAppWidgetId);

        }

        }

        // Ensure updates to app widget can be retrieved from both appWidget Id and tile ID.

        editor.putString(String.valueOf(mAppWidgetId), tile.getId());

        editor.putString(String.valueOf(mAppWidgetId), tile.getId());

        editor.commit();

        editor.putInt(tile.getId(), mAppWidgetId);

        editor.apply();

        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(mContext);

        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(mContext);

        Bundle options = new Bundle();

        Bundle options = new Bundle();

        options.putParcelable(PeopleSpaceUtils.OPTIONS_PEOPLE_SPACE_TILE, tile);

        options.putParcelable(PeopleSpaceUtils.OPTIONS_PEOPLE_SPACE_TILE, tile);

packages/SystemUI/src/com/android/systemui/people/PeopleSpaceTileView.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.systemui.people;

package com.android.systemui.people;





import android.app.people.PeopleSpaceTile;

import android.content.Context;

import android.content.Context;

import android.content.pm.LauncherApps;

import android.content.pm.LauncherApps;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;