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

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make either transfer or expansion on a single route am: 6da04ce007

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17181447

Change-Id: I3655ec81e5efc8fda22697e84868de1afd475d38
This commit is contained in:
shaoweishen
2022-03-22 02:20:35 +00:00
committed by Automerger Merge Worker
parent 30ae832962 6da04ce007
commit e587923222
3 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/media_output_list_item.xml
View File

@@ -33,7 +33,7 @@
android:layout_height="match_parent"
android:background="@drawable/media_output_item_background"
android:layout_gravity="center_vertical|start">
<SeekBar
<com.android.systemui.media.dialog.MediaOutputSeekbar
android:id="@+id/volume_seekbar"
android:splitTrack="false"
android:visibility="gone"
@@ -127,6 +127,7 @@
android:layout_gravity="right|center"
android:button="@drawable/ic_circle_check_box"
android:visibility="gone"
android:clickable="false"
/>
</FrameLayout>
</LinearLayout>

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

@@ -169,12 +169,10 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
setSingleLineLayout(getItemTitle(device), true /* bFocused */,
true /* showSeekBar */,
false /* showProgressBar */, false /* showStatus */);
mCheckBox.setOnCheckedChangeListener(null);
mCheckBox.setVisibility(View.VISIBLE);
mCheckBox.setChecked(true);
mCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
onCheckBoxClicked(false, device);
});
mSeekBar.setOnClickListener(null);
mSeekBar.setOnClickListener(v -> onGroupActionTriggered(false, device));
setCheckBoxColor(mCheckBox, mController.getColorItemContent());
initSeekbar(device);
} else if (!mController.hasAdjustVolumeUserRestriction() && currentlyConnected) {
@@ -188,17 +186,13 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
initSeekbar(device);
mCurrentActivePosition = position;
} else if (isDeviceIncluded(mController.getSelectableMediaDevice(), device)) {
mCheckBox.setOnCheckedChangeListener(null);
mCheckBox.setVisibility(View.VISIBLE);
mCheckBox.setChecked(false);
mCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
onCheckBoxClicked(true, device);
});
mContainerLayout.setOnClickListener(v -> onGroupActionTriggered(true, device));
setCheckBoxColor(mCheckBox, mController.getColorItemContent());
setSingleLineLayout(getItemTitle(device), false /* bFocused */,
false /* showSeekBar */,
false /* showProgressBar */, false /* showStatus */);
mContainerLayout.setOnClickListener(v -> onItemClick(v, device));
} else {
setSingleLineLayout(getItemTitle(device), false /* bFocused */);
mContainerLayout.setOnClickListener(v -> onItemClick(v, device));
@@ -228,7 +222,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
}
}
private void onCheckBoxClicked(boolean isChecked, MediaDevice device) {
private void onGroupActionTriggered(boolean isChecked, MediaDevice device) {
if (isChecked && isDeviceIncluded(mController.getSelectableMediaDevice(), device)) {
mController.addDeviceToPlayMedia(device);
} else if (!isChecked && isDeviceIncluded(mController.getDeselectableMediaDevice(),

68
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputSeekbar.java Normal file
View File

@@ -0,0 +1,68 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.systemui.media.dialog;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.widget.SeekBar;
/**
* Customized seekbar used by MediaOutputDialog, which only changes progress when dragging,
* otherwise performs click.
*/
public class MediaOutputSeekbar extends SeekBar {
private static final int DRAGGING_THRESHOLD = 20;
private boolean mIsDragging = false;
public MediaOutputSeekbar(Context context) {
super(context);
}
public MediaOutputSeekbar(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
public boolean onTouchEvent(MotionEvent event) {
int width = getWidth()
- getPaddingLeft()
- getPaddingRight();
int thumbPos = getPaddingLeft()
+ width
* getProgress()
/ getMax();
if (event.getAction() == MotionEvent.ACTION_DOWN
&& Math.abs(event.getX() - thumbPos) < DRAGGING_THRESHOLD) {
mIsDragging = true;
super.onTouchEvent(event);
} else if (event.getAction() == MotionEvent.ACTION_MOVE && mIsDragging) {
super.onTouchEvent(event);
} else if (event.getAction() == MotionEvent.ACTION_UP && mIsDragging) {
mIsDragging = false;
super.onTouchEvent(event);
} else if (event.getAction() == MotionEvent.ACTION_UP && !mIsDragging) {
performClick();
}
return true;
}
@Override
public boolean performClick() {
return super.performClick();
}
}