Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I800a23d7562224a28a7ee47b65231e165954445e
This commit is contained in:
Flavio Fiszman
2021-06-28 19:24:32 +00:00
committed by Automerger Merge Worker
parent 2fbaf455f4 974d845c06
commit 6a67407263
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/people_tile_medium_with_content.xml
View File

@@ -29,7 +29,7 @@
android:layout_width="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_emoji_background_medium" />
<include layout="@layout/people_status_scrim_layout" />
<LinearLayout
android:id="@+id/content"

6
packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java
View File

@@ -121,6 +121,8 @@ public class PeopleTileViewHelper {
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_QUESTION_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.setTextViewText(R.id.text_content, statusText);
if (status.getActivity() == ACTIVITY_BIRTHDAY) {
setEmojiBackground(views, EMOJI_CAKE);
}
Icon statusIcon = status.getIcon();
if (statusIcon != null) {
// No text content styled text on medium or large.