Add "Stop" button for remote device am: 5fc4c2883d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I139a01e203546ec1bfcbc6077445a24779ae4fb1

5 files changed, 83 insertions, 48 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 9fc64d51cdf7..9b6a9ea80ebe 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java
@@ -42,7 +42,7 @@ import java.util.List;
 public class MediaOutputAdapter extends MediaOutputBaseAdapter {
 
     private static final String TAG = "MediaOutputAdapter";
-    private static final int PAIR_NEW = 1;
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     public MediaOutputAdapter(MediaOutputController controller) {
         super(controller);
@@ -58,11 +58,14 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
 
     @Override
     public void onBindViewHolder(@NonNull MediaDeviceBaseViewHolder viewHolder, int position) {
-        if (mController.isZeroMode() && position == (mController.getMediaDevices().size())) {
-            viewHolder.onBind(PAIR_NEW);
-        } else if (position < (mController.getMediaDevices().size())) {
-            viewHolder.onBind(((List<MediaDevice>) (mController.getMediaDevices())).get(position));
-        } else {
+        final int size = mController.getMediaDevices().size();
+        if (mController.isZeroMode() && position == size) {
+            viewHolder.onBind(CUSTOMIZED_ITEM_PAIR_NEW, false /* topMargin */,
+                    true /* bottomMargin */);
+        } else if (position < size) {
+            viewHolder.onBind(((List<MediaDevice>) (mController.getMediaDevices())).get(position),
+                    position == 0 /* topMargin */, position == (size - 1) /* bottomMargin */);
+        } else if (DEBUG) {
             Log.d(TAG, "Incorrect position: " + position);
         }
     }
@@ -83,7 +86,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
     }
 
     void onItemClick(int customizedItem) {
-        if (customizedItem == PAIR_NEW) {
+        if (customizedItem == CUSTOMIZED_ITEM_PAIR_NEW) {
             mController.launchBluetoothPairing();
         }
     }
@@ -112,51 +115,49 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
         }
 
         @Override
-        void onBind(MediaDevice device) {
-            super.onBind(device);
+        void onBind(MediaDevice device, boolean topMargin, boolean bottomMargin) {
+            super.onBind(device, topMargin, bottomMargin);
             if (mController.isTransferring()) {
                 if (device.getState() == MediaDeviceState.STATE_CONNECTING
                         && !mController.hasAdjustVolumeUserRestriction()) {
-                    setTwoLineLayout(device, true);
-                    mProgressBar.setVisibility(View.VISIBLE);
-                    mSeekBar.setVisibility(View.GONE);
-                    mSubTitleText.setVisibility(View.GONE);
+                    setTwoLineLayout(device, null /* title */, true /* bFocused */,
+                            false /* showSeekBar*/, true /* showProgressBar */,
+                            false /* showSubtitle */);
                 } else {
-                    setSingleLineLayout(getItemTitle(device), false);
+                    setSingleLineLayout(getItemTitle(device), false /* bFocused */);
                 }
             } else {
                 // Set different layout for each device
                 if (device.getState() == MediaDeviceState.STATE_CONNECTING_FAILED) {
-                    setTwoLineLayout(device, false);
-                    mSubTitleText.setVisibility(View.VISIBLE);
-                    mSeekBar.setVisibility(View.GONE);
-                    mProgressBar.setVisibility(View.GONE);
+                    setTwoLineLayout(device, null /* title */, false /* bFocused */,
+                            false /* showSeekBar*/, false /* showProgressBar */,
+                            true /* showSubtitle */);
                     mSubTitleText.setText(R.string.media_output_dialog_connect_failed);
                     mFrameLayout.setOnClickListener(v -> onItemClick(device));
                 } else if (!mController.hasAdjustVolumeUserRestriction()
                         && isCurrentConnected(device)) {
-                    setTwoLineLayout(device, true);
-                    mSeekBar.setVisibility(View.VISIBLE);
-                    mProgressBar.setVisibility(View.GONE);
-                    mSubTitleText.setVisibility(View.GONE);
+                    setTwoLineLayout(device, null /* title */, true /* bFocused */,
+                            true /* showSeekBar*/, false /* showProgressBar */,
+                            false /* showSubtitle */);
                     initSeekbar(device);
                 } else {
-                    setSingleLineLayout(getItemTitle(device), false);
+                    setSingleLineLayout(getItemTitle(device), false /* bFocused */);
                     mFrameLayout.setOnClickListener(v -> onItemClick(device));
                 }
             }
         }
 
         @Override
-        void onBind(int customizedItem) {
-            if (customizedItem == PAIR_NEW) {
+        void onBind(int customizedItem, boolean topMargin, boolean bottomMargin) {
+            super.onBind(customizedItem, topMargin, bottomMargin);
+            if (customizedItem == CUSTOMIZED_ITEM_PAIR_NEW) {
                 setSingleLineLayout(mContext.getText(R.string.media_output_dialog_pairing_new),
-                        false);
+                        false /* bFocused */);
                 final Drawable d = mContext.getDrawable(R.drawable.ic_add);
                 d.setColorFilter(new PorterDuffColorFilter(
                         Utils.getColorAccentDefaultColor(mContext), PorterDuff.Mode.SRC_IN));
                 mTitleIcon.setImageDrawable(d);
-                mFrameLayout.setOnClickListener(v -> onItemClick(PAIR_NEW));
+                mFrameLayout.setOnClickListener(v -> onItemClick(CUSTOMIZED_ITEM_PAIR_NEW));
             }
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java
index 7579c25b030a..01dc6c4b71da 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java
@@ -44,9 +44,12 @@ public abstract class MediaOutputBaseAdapter extends
     private static final String FONT_SELECTED_TITLE = "sans-serif-medium";
     private static final String FONT_TITLE = "sans-serif";
 
+    static final int CUSTOMIZED_ITEM_PAIR_NEW = 1;
+
     final MediaOutputController mController;
 
     private boolean mIsDragging;
+    private int mMargin;
 
     Context mContext;
     View mHolderView;
@@ -60,6 +63,8 @@ public abstract class MediaOutputBaseAdapter extends
     public MediaDeviceBaseViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup,
             int viewType) {
         mContext = viewGroup.getContext();
+        mMargin = mContext.getResources().getDimensionPixelSize(
+                R.dimen.media_output_dialog_list_margin);
         mHolderView = LayoutInflater.from(mContext).inflate(R.layout.media_output_list_item,
                 viewGroup, false);
 
@@ -106,12 +111,26 @@ public abstract class MediaOutputBaseAdapter extends
             mSeekBar = view.requireViewById(R.id.volume_seekbar);
         }
 
-        void onBind(MediaDevice device) {
+        void onBind(MediaDevice device, boolean topMargin, boolean bottomMargin) {
             mTitleIcon.setImageIcon(mController.getDeviceIconCompat(device).toIcon(mContext));
+            setMargin(topMargin, bottomMargin);
         }
 
-        void onBind(int customizedItem) { }
+        void onBind(int customizedItem, boolean topMargin, boolean bottomMargin) {
+            setMargin(topMargin, bottomMargin);
+        }
 
+        private void setMargin(boolean topMargin, boolean bottomMargin) {
+            ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mFrameLayout
+                    .getLayoutParams();
+            if (topMargin) {
+                params.topMargin = mMargin;
+            }
+            if (bottomMargin) {
+                params.bottomMargin = mMargin;
+            }
+            mFrameLayout.setLayoutParams(params);
+        }
         void setSingleLineLayout(CharSequence title, boolean bFocused) {
             mTitleText.setVisibility(View.VISIBLE);
             mTwoLineLayout.setVisibility(View.GONE);
@@ -123,10 +142,19 @@ public abstract class MediaOutputBaseAdapter extends
             }
         }
 
-        void setTwoLineLayout(MediaDevice device, boolean bFocused) {
+        void setTwoLineLayout(MediaDevice device, CharSequence title, boolean bFocused,
+                boolean showSeekBar, boolean showProgressBar, boolean showSubtitle) {
             mTitleText.setVisibility(View.GONE);
             mTwoLineLayout.setVisibility(View.VISIBLE);
-            mTwoLineTitleText.setText(getItemTitle(device));
+            mSeekBar.setVisibility(showSeekBar ? View.VISIBLE : View.GONE);
+            mProgressBar.setVisibility(showProgressBar ? View.VISIBLE : View.GONE);
+            mSubTitleText.setVisibility(showSubtitle ? View.VISIBLE : View.GONE);
+            if (device == null) {
+                mTwoLineTitleText.setText(title);
+            } else {
+                mTwoLineTitleText.setText(getItemTitle(device));
+            }
+
             if (bFocused) {
                 mTwoLineTitleText.setTypeface(Typeface.create(FONT_SELECTED_TITLE,
                         Typeface.NORMAL));
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
index 781bf8d74d88..a589b07b61fc 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
@@ -33,7 +33,6 @@ import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -69,12 +68,9 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
     private LinearLayout mDeviceListLayout;
     private Button mDoneButton;
     private Button mStopButton;
-    private View mListBottomPadding;
     private int mListMaxHeight;
 
     MediaOutputBaseAdapter mAdapter;
-    FrameLayout mGroupItemController;
-    View mGroupDivider;
 
     private final ViewTreeObserver.OnGlobalLayoutListener mDeviceListLayoutListener = () -> {
         // Set max height for list
@@ -114,12 +110,9 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
         mHeaderSubtitle = mDialogView.requireViewById(R.id.header_subtitle);
         mHeaderIcon = mDialogView.requireViewById(R.id.header_icon);
         mDevicesRecyclerView = mDialogView.requireViewById(R.id.list_result);
-        mGroupItemController = mDialogView.requireViewById(R.id.group_item_controller);
-        mGroupDivider = mDialogView.requireViewById(R.id.group_item_divider);
         mDeviceListLayout = mDialogView.requireViewById(R.id.device_list);
         mDoneButton = mDialogView.requireViewById(R.id.done);
         mStopButton = mDialogView.requireViewById(R.id.stop);
-        mListBottomPadding = mDialogView.requireViewById(R.id.list_bottom_padding);
 
         mDeviceListLayout.getViewTreeObserver().addOnGlobalLayoutListener(
                 mDeviceListLayoutListener);
@@ -162,7 +155,9 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
         }
         if (mHeaderIcon.getVisibility() == View.VISIBLE) {
             final int size = getHeaderIconSize();
-            mHeaderIcon.setLayoutParams(new LinearLayout.LayoutParams(size, size));
+            final int padding = mContext.getResources().getDimensionPixelSize(
+                    R.dimen.media_output_dialog_header_icon_padding);
+            mHeaderIcon.setLayoutParams(new LinearLayout.LayoutParams(size + padding, size));
         }
         // Update title and subtitle
         mHeaderTitle.setText(getHeaderText());
@@ -178,12 +173,8 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
         if (!mAdapter.isDragging()) {
             mAdapter.notifyDataSetChanged();
         }
-        // Add extra padding when device amount is less than 6
-        if (mMediaOutputController.getMediaDevices().size() < 6) {
-            mListBottomPadding.setVisibility(View.VISIBLE);
-        } else {
-            mListBottomPadding.setVisibility(View.GONE);
-        }
+        // Show when remote media session is available
+        mStopButton.setVisibility(getStopButtonVisibility());
     }
 
     abstract int getHeaderIconRes();
@@ -196,6 +187,8 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
 
     abstract CharSequence getHeaderSubtitle();
 
+    abstract int getStopButtonVisibility();
+
     @Override
     public void onMediaChanged() {
         mMainThreadHandler.post(() -> refresh());
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
index 64d20a273931..b1f1bda25961 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
@@ -24,6 +24,7 @@ import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.media.MediaMetadata;
+import android.media.MediaRoute2Info;
 import android.media.RoutingSessionInfo;
 import android.media.session.MediaController;
 import android.media.session.MediaSessionManager;
@@ -63,7 +64,7 @@ import javax.inject.Inject;
 public class MediaOutputController implements LocalMediaManager.DeviceCallback{
 
     private static final String TAG = "MediaOutputController";
-    private static final boolean DEBUG = false;
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     private final String mPackageName;
     private final Context mContext;
@@ -406,6 +407,14 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback{
         mActivityStarter.dismissKeyguardThenExecute(postKeyguardAction, null, true);
     }
 
+    boolean isActiveRemoteDevice(@NonNull MediaDevice device) {
+        final List<String> features = device.getFeatures();
+        return (features.contains(MediaRoute2Info.FEATURE_REMOTE_PLAYBACK)
+                || features.contains(MediaRoute2Info.FEATURE_REMOTE_AUDIO_PLAYBACK)
+                || features.contains(MediaRoute2Info.FEATURE_REMOTE_VIDEO_PLAYBACK)
+                || features.contains(MediaRoute2Info.FEATURE_REMOTE_GROUP_PLAYBACK));
+    }
+
     private final MediaController.Callback mCb = new MediaController.Callback() {
         @Override
         public void onMetadataChanged(MediaMetadata metadata) {
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java
index d59971dea2d7..c0138f0e200a 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java
@@ -46,8 +46,6 @@ public class MediaOutputDialog extends MediaOutputBaseDialog {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mGroupItemController.setVisibility(View.GONE);
-        mGroupDivider.setVisibility(View.GONE);
     }
 
     @Override
@@ -75,4 +73,10 @@ public class MediaOutputDialog extends MediaOutputBaseDialog {
     CharSequence getHeaderSubtitle() {
         return mMediaOutputController.getHeaderSubTitle();
     }
+
+    @Override
+    int getStopButtonVisibility() {
+        return mMediaOutputController.isActiveRemoteDevice(
+                mMediaOutputController.getCurrentConnectedMediaDevice()) ? View.VISIBLE : View.GONE;
+    }
 }