Merge "[Output Switcher] Delete Media Output Group related code" into tm-qpr-dev (184d8894) · Commits · e / os / android_frameworks_base

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -42,14 +42,11 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
		private static final String TAG = "MediaOutputAdapter";
		private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

		private final MediaOutputDialog mMediaOutputDialog;
		private ViewGroup mConnectedItem;
		private boolean mIncludeDynamicGroup;

		public MediaOutputAdapter(MediaOutputController controller,
		MediaOutputDialog mediaOutputDialog) {
		public MediaOutputAdapter(MediaOutputController controller) {
		super(controller);
		mMediaOutputDialog = mediaOutputDialog;
		setHasStableIds(true);
		}

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ public class MediaOutputBroadcastDialog extends MediaOutputBaseDialog {
		MediaOutputBroadcastDialog(Context context, boolean aboveStatusbar,
		BroadcastSender broadcastSender, MediaOutputController mediaOutputController) {
		super(context, broadcastSender, mediaOutputController);
		mAdapter = new MediaOutputGroupAdapter(mMediaOutputController);
		mAdapter = new MediaOutputAdapter(mMediaOutputController);
		// TODO(b/226710953): Move the part to MediaOutputBaseDialog for every class
		// that extends MediaOutputBaseDialog
		if (!aboveStatusbar) {

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ public class MediaOutputDialog extends MediaOutputBaseDialog {
		MediaOutputController mediaOutputController, UiEventLogger uiEventLogger) {
		super(context, broadcastSender, mediaOutputController);
		mUiEventLogger = uiEventLogger;
		mAdapter = new MediaOutputAdapter(mMediaOutputController, this);
		mAdapter = new MediaOutputAdapter(mMediaOutputController);
		if (!aboveStatusbar) {
		getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);
		}

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputGroupAdapter.java

deleted100644 → 0

+0 −172

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.graphics.Bitmap;
		import android.graphics.Canvas;
		import android.graphics.drawable.Drawable;
		import android.text.TextUtils;
		import android.util.Log;
		import android.util.TypedValue;
		import android.view.View;
		import android.view.ViewGroup;

		import androidx.annotation.NonNull;

		import com.android.settingslib.media.MediaDevice;
		import com.android.systemui.R;

		import java.util.List;

		/**
		* Adapter for media output dynamic group dialog.
		*/
		//TODO: clear this class after new UI updated
		public class MediaOutputGroupAdapter extends MediaOutputBaseAdapter {

		private static final String TAG = "MediaOutputGroupAdapter";
		private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

		private final List<MediaDevice> mGroupMediaDevices;

		public MediaOutputGroupAdapter(MediaOutputController controller) {
		super(controller);
		mGroupMediaDevices = controller.getGroupMediaDevices();
		}

		@Override
		public MediaDeviceBaseViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup,
		int viewType) {
		super.onCreateViewHolder(viewGroup, viewType);

		return new GroupViewHolder(mHolderView);
		}

		@Override
		public void onBindViewHolder(@NonNull MediaDeviceBaseViewHolder viewHolder, int position) {
		// Add "Group"
		if (position == 0) {
		viewHolder.onBind(CUSTOMIZED_ITEM_GROUP, true /* topMargin */,
		false /* bottomMargin */);
		return;
		}
		// Add available devices
		final int newPosition = position - 1;
		final int size = mGroupMediaDevices.size();
		if (newPosition < size) {
		viewHolder.onBind(mGroupMediaDevices.get(newPosition), false /* topMargin */,
		newPosition == (size - 1) /* bottomMargin */, position);
		return;
		}
		if (DEBUG) {
		Log.d(TAG, "Incorrect position: " + position);
		}
		}

		@Override
		public int getItemCount() {
		// Require extra item for group volume operation
		return mGroupMediaDevices.size() + 1;
		}

		@Override
		CharSequence getItemTitle(MediaDevice device) {
		return super.getItemTitle(device);
		}

		class GroupViewHolder extends MediaDeviceBaseViewHolder {

		GroupViewHolder(View view) {
		super(view);
		}

		@Override
		void onBind(MediaDevice device, boolean topMargin, boolean bottomMargin, int position) {
		super.onBind(device, topMargin, bottomMargin, position);
		mCheckBox.setVisibility(View.VISIBLE);
		mCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
		onCheckBoxClicked(isChecked, device);
		});
		boolean isCurrentSeekbarInvisible = mSeekBar.getVisibility() == View.GONE;
		setTwoLineLayout(device, false /* bFocused /, true / showSeekBar */,
		false /* showProgressBar /, false / showSubtitle*/);
		initSeekbar(device, isCurrentSeekbarInvisible);
		final List<MediaDevice> selectedDevices = mController.getSelectedMediaDevice();
		if (isDeviceIncluded(mController.getSelectableMediaDevice(), device)) {
		mCheckBox.setButtonDrawable(R.drawable.ic_check_box);
		mCheckBox.setChecked(false);
		mCheckBox.setEnabled(true);
		} else if (isDeviceIncluded(selectedDevices, device)) {
		if (selectedDevices.size() == 1 \|\| !isDeviceIncluded(
		mController.getDeselectableMediaDevice(), device)) {
		mCheckBox.setButtonDrawable(getDisabledCheckboxDrawable());
		mCheckBox.setChecked(true);
		mCheckBox.setEnabled(false);
		} else {
		mCheckBox.setButtonDrawable(R.drawable.ic_check_box);
		mCheckBox.setChecked(true);
		mCheckBox.setEnabled(true);
		}
		}
		}

		@Override
		void onBind(int customizedItem, boolean topMargin, boolean bottomMargin) {
		if (customizedItem == CUSTOMIZED_ITEM_GROUP) {
		setTwoLineLayout(mContext.getText(R.string.media_output_dialog_group),
		true /* bFocused /, true / showSeekBar /, false / showProgressBar */,
		false /* showSubtitle*/);
		mTitleIcon.setImageDrawable(getSpeakerDrawable());
		mCheckBox.setVisibility(View.GONE);
		initSessionSeekbar();
		}
		}

		private void onCheckBoxClicked(boolean isChecked, MediaDevice device) {
		if (isChecked && isDeviceIncluded(mController.getSelectableMediaDevice(), device)) {
		mController.addDeviceToPlayMedia(device);
		} else if (!isChecked && isDeviceIncluded(mController.getDeselectableMediaDevice(),
		device)) {
		mController.removeDeviceFromPlayMedia(device);
		}
		}

		private Drawable getDisabledCheckboxDrawable() {
		final Drawable drawable = mContext.getDrawable(R.drawable.ic_check_box_blue_24dp)
		.mutate();
		final Bitmap checkbox = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
		drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
		final Canvas canvas = new Canvas(checkbox);
		TypedValue value = new TypedValue();
		mContext.getTheme().resolveAttribute(android.R.attr.disabledAlpha, value, true);
		drawable.setAlpha((int) (value.getFloat() * 255));
		drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
		drawable.draw(canvas);

		return drawable;
		}

		private boolean isDeviceIncluded(List<MediaDevice> deviceList, MediaDevice targetDevice) {
		for (MediaDevice device : deviceList) {
		if (TextUtils.equals(device.getId(), targetDevice.getId())) {
		return true;
		}
		}
		return false;
		}
		}
		}

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputGroupDialog.java

deleted100644 → 0

+0 −97

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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.graphics.drawable.Drawable;
		import android.os.Bundle;
		import android.view.View;
		import android.view.WindowManager;

		import androidx.core.graphics.drawable.IconCompat;

		import com.android.systemui.R;
		import com.android.systemui.broadcast.BroadcastSender;

		/**
		* Dialog for media output group.
		*/
		// TODO(b/203073091): Remove this class once group logic been implemented.
		public class MediaOutputGroupDialog extends MediaOutputBaseDialog {

		MediaOutputGroupDialog(Context context, boolean aboveStatusbar, BroadcastSender broadcastSender,
		MediaOutputController mediaOutputController) {
		super(context, broadcastSender, mediaOutputController);
		mMediaOutputController.resetGroupMediaDevices();
		mAdapter = new MediaOutputGroupAdapter(mMediaOutputController);
		if (!aboveStatusbar) {
		getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);
		}
		}

		@Override
		public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		}

		@Override
		int getHeaderIconRes() {
		return R.drawable.ic_arrow_back;
		}

		@Override
		IconCompat getHeaderIcon() {
		return null;
		}

		@Override
		int getHeaderIconSize() {
		return mContext.getResources().getDimensionPixelSize(
		R.dimen.media_output_dialog_header_back_icon_size);
		}

		@Override
		CharSequence getHeaderText() {
		return mContext.getString(R.string.media_output_dialog_add_output);
		}

		@Override
		CharSequence getHeaderSubtitle() {
		final int size = mMediaOutputController.getSelectedMediaDevice().size();
		if (size == 1) {
		return mContext.getText(R.string.media_output_dialog_single_device);
		}
		return mContext.getString(R.string.media_output_dialog_multiple_devices, size);
		}

		@Override
		Drawable getAppSourceIcon() {
		return null;
		}

		@Override
		int getStopButtonVisibility() {
		return View.VISIBLE;
		}

		@Override
		void onHeaderIconClick() {
		// Given that we launched the media output group dialog from the media output dialog,
		// dismissing this dialog will show the media output dialog again.
		dismiss();
		}
		}