diff options
| author | Jeff DeCew <jeffdq@google.com> | 2020-10-15 14:52:35 -0400 |
|---|---|---|
| committer | Jeff DeCew <jeffdq@google.com> | 2020-10-16 15:15:34 -0400 |
| commit | e12ff8a21cb5146ac28f590507d0a44f43d03e64 (patch) | |
| tree | 7f4249c385aa233dcb02f37bd24abe432871223e /core/java/android/view/NotificationHeaderView.java | |
| parent | 2374b9147f367633d03ee02de9f50231e79d5984 (diff) | |
Remove the old seamless chip
Test: manual - play audio, use the real seamless chip
Change-Id: I0cc93c222dd6ae7bc3a823f27967d98fb39e8cd9
Diffstat (limited to 'core/java/android/view/NotificationHeaderView.java')
| -rw-r--r-- | core/java/android/view/NotificationHeaderView.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java index 0c3d61f31dfb..8b0de0807872 100644 --- a/core/java/android/view/NotificationHeaderView.java +++ b/core/java/android/view/NotificationHeaderView.java @@ -28,7 +28,6 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.RemoteViews; import com.android.internal.R; @@ -54,7 +53,6 @@ public class NotificationHeaderView extends ViewGroup { private OnClickListener mExpandClickListener; private OnClickListener mFeedbackListener; private HeaderTouchListener mTouchListener = new HeaderTouchListener(); - private LinearLayout mTransferChip; private NotificationExpandButton mExpandButton; private CachingIconView mIcon; private View mProfileBadge; @@ -111,7 +109,6 @@ public class NotificationHeaderView extends ViewGroup { mAppName = findViewById(com.android.internal.R.id.app_name_text); mHeaderText = findViewById(com.android.internal.R.id.header_text); mSecondaryHeaderText = findViewById(com.android.internal.R.id.header_text_secondary); - mTransferChip = findViewById(com.android.internal.R.id.media_seamless); mExpandButton = findViewById(com.android.internal.R.id.expand_button); mIcon = findViewById(com.android.internal.R.id.icon); mProfileBadge = findViewById(com.android.internal.R.id.profile_badge); @@ -143,8 +140,7 @@ public class NotificationHeaderView extends ViewGroup { // Icons that should go at the end if ((child == mExpandButton && mShowExpandButtonAtEnd) || child == mProfileBadge - || child == mFeedbackIcon - || child == mTransferChip) { + || child == mFeedbackIcon) { iconWidth += lp.leftMargin + lp.rightMargin + child.getMeasuredWidth(); } else { totalWidth += lp.leftMargin + lp.rightMargin + child.getMeasuredWidth(); @@ -208,8 +204,7 @@ public class NotificationHeaderView extends ViewGroup { // Icons that should go at the end if ((child == mExpandButton && mShowExpandButtonAtEnd) || child == mProfileBadge - || child == mFeedbackIcon - || child == mTransferChip) { + || child == mFeedbackIcon) { if (end == getMeasuredWidth()) { layoutRight = end - mContentEndMargin; } else { |