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

Merge "Set notification TAG and style in TV PIP notification" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-12 20:26:51 +00:00
committed by Android (Google) Code Review
parent 6c97781468 bad26692d0
commit c82737b98f
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java
View File

@@ -44,6 +44,7 @@ import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
*/ */
public class PipNotification { public class PipNotification {
private static final String TAG = "PipNotification"; private static final String TAG = "PipNotification";
private static final String NOTIFICATION_TAG = PipNotification.class.getName();
private static final boolean DEBUG = PipManager.DEBUG; private static final boolean DEBUG = PipManager.DEBUG;
private static final String ACTION_MENU = "PipNotification.menu"; private static final String ACTION_MENU = "PipNotification.menu";
@@ -56,7 +57,7 @@ public class PipNotification {
private MediaController mMediaController; private MediaController mMediaController;
private String mDefaultTitle; private String mDefaultTitle;
private Icon mDefaultIcon; private int mDefaultIconResId;
private boolean mNotified; private boolean mNotified;
private String mTitle; private String mTitle;
@@ -167,9 +168,8 @@ public class PipNotification {
void onConfigurationChanged(Context context) { void onConfigurationChanged(Context context) {
Resources res = context.getResources(); Resources res = context.getResources();
mDefaultTitle = res.getString(R.string.pip_notification_unknown_title); mDefaultTitle = res.getString(R.string.pip_notification_unknown_title);
mDefaultIcon = Icon.createWithResource(context, mDefaultIconResId = res.getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_LTR
res.getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_LTR ? R.drawable.pip_expand_ll : R.drawable.pip_expand_lr;
? R.drawable.pip_expand_ll : R.drawable.pip_expand_lr);
if (mNotified) { if (mNotified) {
// update notification // update notification
notifyPipNotification(); notifyPipNotification();
@@ -181,12 +181,16 @@ public class PipNotification {
mNotificationBuilder mNotificationBuilder
.setShowWhen(true) .setShowWhen(true)
.setWhen(System.currentTimeMillis()) .setWhen(System.currentTimeMillis())
// TODO: Sending bitmap doesn't work in launcher side. Once launcher supports it, .setSmallIcon(mDefaultIconResId)
// we can set icon.
//.setSmallIcon(mArt != null ? Icon.createWithBitmap(mArt) : mDefaultIcon)
.setSmallIcon(mDefaultIcon.getResId())
.setContentTitle(!TextUtils.isEmpty(mTitle) ? mTitle : mDefaultTitle); .setContentTitle(!TextUtils.isEmpty(mTitle) ? mTitle : mDefaultTitle);
mNotificationManager.notify(SystemMessage.NOTE_TV_PIP, mNotificationBuilder.build()); if (mArt != null) {
mNotificationBuilder.setStyle(new Notification.BigPictureStyle()
.bigPicture(mArt));
} else {
mNotificationBuilder.setStyle(null);
}
mNotificationManager.notify(NOTIFICATION_TAG, SystemMessage.NOTE_TV_PIP,
mNotificationBuilder.build());
} }
private void dismissPipNotification() { private void dismissPipNotification() {