diff options
| author | 2022-05-11 00:45:05 +0000 | |
|---|---|---|
| committer | 2022-05-11 00:45:05 +0000 | |
| commit | 5f84977c03e11a848c6644ff3886d54f7b1336d1 (patch) | |
| tree | bde0fdf43b65d268d5ff4571d877702302491875 | |
| parent | afd722757e8a9efc17668ae256751eadcc1b880c (diff) | |
| parent | dbf7d03b5d8856f8c9929e2c49b902d55b7b304d (diff) | |
DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc9a am: dbf7d03b5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937
Change-Id: I8356ad296d7b17b9682cd9d8a89748ebd99c97a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java index 58a35ff7e350..ec472c655b43 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java @@ -211,16 +211,13 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { View.IMPORTANT_FOR_ACCESSIBILITY_YES); setUpContentDescriptionForView(mEndTouchArea, true, device); } else if (!mController.hasAdjustVolumeUserRestriction() && currentlyConnected) { - mStatusIcon.setImageDrawable( - mContext.getDrawable(R.drawable.media_output_status_check)); - mStatusIcon.setColorFilter(mController.getColorItemContent()); mTitleIcon.setImageDrawable( mContext.getDrawable(R.drawable.media_output_icon_volume)); mTitleIcon.setColorFilter(mController.getColorItemContent()); mTitleText.setTextColor(mController.getColorItemContent()); setSingleLineLayout(getItemTitle(device), true /* bFocused */, true /* showSeekBar */, - false /* showProgressBar */, true /* showStatus */); + false /* showProgressBar */, false /* showStatus */); initSeekbar(device, isCurrentSeekbarInvisible); setUpContentDescriptionForView(mContainerLayout, false, device); mCurrentActivePosition = position; |