Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6da2bd2 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Swithcer] Fix deeplink and disable single device layout" into udc-dev am: 7a64585e 

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



Change-Id: Ie61b5b81e83f5e65f7ed956d98d3a1f147d02e54
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a11fef37 7a64585e

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

+7 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                            updateDeviceStatusIcon(deviceStatusIcon);

                            mStatusIcon.setVisibility(View.VISIBLE);

                        }

                        updateTwoLineLayoutContentAlpha(

                        updateSingleLineLayoutContentAlpha(

                                updateClickActionBasedOnSelectionBehavior(device)

                                        ? DEVICE_CONNECTED_ALPHA : DEVICE_DISCONNECTED_ALPHA);

                    } else {
@@ -364,6 +364,12 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            mStatusIcon.setAlpha(alphaValue);

        }



        private void updateSingleLineLayoutContentAlpha(float alphaValue) {

            mTitleIcon.setAlpha(alphaValue);

            mTitleText.setAlpha(alphaValue);

            mStatusIcon.setAlpha(alphaValue);

        }



        private void updateEndClickAreaAsSessionEditing(MediaDevice device) {

            mEndClickIcon.setOnClickListener(null);

            mEndTouchArea.setOnClickListener(null);

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

+0 −1
Original line number Diff line number Diff line
@@ -395,7 +395,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
            launchIntent.putExtra(EXTRA_ROUTE_ID, routeId);

            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            mCallback.dismissDialog();

            mContext.startActivity(launchIntent);

            mActivityStarter.startActivity(launchIntent, true, controller);

        }

    }