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

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev

Browse Source
This commit is contained in:
Shaowei Shen
2022-05-10 23:58:44 +00:00
committed by Android (Google) Code Review
parent 89c3325804 94280acc9a
commit 57fb8fe507
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java
View File

@@ -211,16 +211,13 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
View.IMPORTANT_FOR_ACCESSIBILITY_YES); View.IMPORTANT_FOR_ACCESSIBILITY_YES);
setUpContentDescriptionForView(mEndTouchArea, true, device); setUpContentDescriptionForView(mEndTouchArea, true, device);
} else if (!mController.hasAdjustVolumeUserRestriction() && currentlyConnected) { } else if (!mController.hasAdjustVolumeUserRestriction() && currentlyConnected) {
mStatusIcon.setImageDrawable(
mContext.getDrawable(R.drawable.media_output_status_check));
mStatusIcon.setColorFilter(mController.getColorItemContent());
mTitleIcon.setImageDrawable( mTitleIcon.setImageDrawable(
mContext.getDrawable(R.drawable.media_output_icon_volume)); mContext.getDrawable(R.drawable.media_output_icon_volume));
mTitleIcon.setColorFilter(mController.getColorItemContent()); mTitleIcon.setColorFilter(mController.getColorItemContent());
mTitleText.setTextColor(mController.getColorItemContent()); mTitleText.setTextColor(mController.getColorItemContent());
setSingleLineLayout(getItemTitle(device), true /* bFocused */, setSingleLineLayout(getItemTitle(device), true /* bFocused */,
true /* showSeekBar */, true /* showSeekBar */,
false /* showProgressBar */, true /* showStatus */); false /* showProgressBar */, false /* showStatus */);
initSeekbar(device, isCurrentSeekbarInvisible); initSeekbar(device, isCurrentSeekbarInvisible);
setUpContentDescriptionForView(mContainerLayout, false, device); setUpContentDescriptionForView(mContainerLayout, false, device);
mCurrentActivePosition = position; mCurrentActivePosition = position;