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

Commit 6a674072 authored by Flavio Fiszman's avatar Flavio Fiszman Committed by Automerger Merge Worker
Browse files

Merge "Add birthday status emoji decoration" into sc-dev am: 974d845c 

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

Change-Id: I800a23d7562224a28a7ee47b65231e165954445e
parents 2fbaf455 974d845c

packages/SystemUI/res/layout/people_tile_medium_with_content.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="match_parent">

        <include layout="@layout/people_tile_punctuation_background_medium" />

        <include layout="@layout/people_tile_punctuation_background_medium" />

        <include layout="@layout/people_tile_punctuation_background_medium" />

        <include layout="@layout/people_tile_emoji_background_medium" />

        <include layout="@layout/people_status_scrim_layout" />

        <include layout="@layout/people_status_scrim_layout" />

        <LinearLayout

        <LinearLayout

            android:id="@+id/content"

            android:id="@+id/content"

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -121,6 +121,8 @@ public class PeopleTileViewHelper { 




    private static final int MESSAGES_COUNT_OVERFLOW = 6;

    private static final int MESSAGES_COUNT_OVERFLOW = 6;





    private static final CharSequence EMOJI_CAKE = "\ud83c\udf82";



    private static final Pattern DOUBLE_EXCLAMATION_PATTERN = Pattern.compile("[!][!]+");

    private static final Pattern DOUBLE_EXCLAMATION_PATTERN = Pattern.compile("[!][!]+");

    private static final Pattern DOUBLE_QUESTION_PATTERN = Pattern.compile("[?][?]+");

    private static final Pattern DOUBLE_QUESTION_PATTERN = Pattern.compile("[?][?]+");

    private static final Pattern ANY_DOUBLE_MARK_PATTERN = Pattern.compile("[!?][!?]+");

    private static final Pattern ANY_DOUBLE_MARK_PATTERN = Pattern.compile("[!?][!?]+");
@@ -704,6 +706,10 @@ public class PeopleTileViewHelper { 
        views.setViewVisibility(R.id.predefined_icon, View.VISIBLE);

        views.setViewVisibility(R.id.predefined_icon, View.VISIBLE);

        views.setTextViewText(R.id.text_content, statusText);

        views.setTextViewText(R.id.text_content, statusText);





        if (status.getActivity() == ACTIVITY_BIRTHDAY) {

            setEmojiBackground(views, EMOJI_CAKE);

        }



        Icon statusIcon = status.getIcon();

        Icon statusIcon = status.getIcon();

        if (statusIcon != null) {

        if (statusIcon != null) {

            // No text content styled text on medium or large.

            // No text content styled text on medium or large.