Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Reland of Android Media Notification: remove "Touch to return" text. …
Browse files Browse the repository at this point in the history
…(patchset #1 id:1 of https://codereview.chromium.org/1307093008/ )

Reason for revert:
Wrongful conviction.

Original issue's description:
> Revert of Android Media Notification: remove "Touch to return" text. (patchset #1 id:1 of https://codereview.chromium.org/1326163002/ )
>
> Reason for revert:
> This breaks the downstream test HostDriven_SigninTest.testManagedSignin.
>
> Original issue's description:
> > Android Media Notification: remove "Touch to return" text.
> >
> > The notification only shows the origin. Touching the notification to
> > return to the playing application is a very common pattern on Android.
> > It is not required for us to reinforce it with text, making the
> > notification less appealing.
> >
> > BUG=528202
> >
> > Committed: https://crrev.com/ded797a710c1a07b06f8d84d697c54671a942b35
> > Cr-Commit-Position: refs/heads/master@{#347377}
>
> [email protected],[email protected],[email protected]
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=528202
>
> Committed: https://crrev.com/2fa386cfd0174b20b8ec67c3e3a2503ef479bd3a
> Cr-Commit-Position: refs/heads/master@{#347533}

[email protected],[email protected],[email protected]
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=528202

Review URL: https://codereview.chromium.org/1306123010

Cr-Commit-Position: refs/heads/master@{#347572}
  • Loading branch information
mounirlamouri authored and Commit bot committed Sep 5, 2015
1 parent c1d1b75 commit 1626ba4
Showing 1 changed file with 1 addition and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -346,14 +346,6 @@ private String sanitizeMediaTitle(String title) {
return title.startsWith("\u25B6") ? title.substring(1).trim() : title;
}

private String getStatus() {
if (mMediaNotificationInfo.origin != null) {
return mContext.getString(R.string.media_notification_link_text,
mMediaNotificationInfo.origin);
}
return mContext.getString(R.string.media_notification_text_no_link);
}

private PendingIntent createContentIntent() {
int tabId = mMediaNotificationInfo.tabId;
return PendingIntent.getActivity(
Expand Down Expand Up @@ -411,7 +403,7 @@ private void updateNotification() {
RemoteViews contentView = createContentView();

contentView.setTextViewText(R.id.title, mMediaNotificationInfo.title);
contentView.setTextViewText(R.id.status, getStatus());
contentView.setTextViewText(R.id.status, mMediaNotificationInfo.origin);
if (mNotificationIcon != null) {
contentView.setImageViewBitmap(R.id.icon, mNotificationIcon);
} else {
Expand Down

0 comments on commit 1626ba4

Please sign in to comment.