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

Merge "Add placeholder to priority onboarding" into rvc-qpr-dev am: 8f7a55c84e

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

Change-Id: I76484c6f9947df5f451bc51ecd1986b428d4536d
This commit is contained in:
TreeHugger Robot
2020-09-14 18:49:23 +00:00
committed by Automerger Merge Worker
parent 723a7028c7 8f7a55c84e
commit ed59e135d7
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
View File

@@ -42,6 +42,8 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager; import android.content.pm.ShortcutManager;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Handler; import android.os.Handler;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
@@ -539,12 +541,21 @@ public class NotificationConversationInfo extends LinearLayout implements
&& Settings.Global.getInt(mContext.getContentResolver(), && Settings.Global.getInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, 0) == 1; NOTIFICATION_BUBBLES, 0) == 1;
Drawable person = mIconFactory.getBaseIconDrawable(mShortcutInfo);
if (person == null) {
person = mContext.getDrawable(R.drawable.ic_person).mutate();
TypedArray ta = mContext.obtainStyledAttributes(new int[]{android.R.attr.colorAccent});
int colorAccent = ta.getColor(0, 0);
ta.recycle();
person.setTint(colorAccent);
}
PriorityOnboardingDialogController controller = mBuilderProvider.get() PriorityOnboardingDialogController controller = mBuilderProvider.get()
.setContext(mUserContext) .setContext(mUserContext)
.setView(onboardingView) .setView(onboardingView)
.setIgnoresDnd(ignoreDnd) .setIgnoresDnd(ignoreDnd)
.setShowsAsBubble(showAsBubble) .setShowsAsBubble(showAsBubble)
.setIcon(mIconFactory.getBaseIconDrawable(mShortcutInfo)) .setIcon(person)
.setBadge(mIconFactory.getAppBadge( .setBadge(mIconFactory.getAppBadge(
mPackageName, UserHandle.getUserId(mSbn.getUid()))) mPackageName, UserHandle.getUserId(mSbn.getUid())))
.setOnSettingsClick(mOnConversationSettingsClickListener) .setOnSettingsClick(mOnConversationSettingsClickListener)