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

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

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

Change-Id: Ieaeb5776d992484dc3492f86e791ff2930c61154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shaowei Shen
2023-03-23 11:00:17 +00:00
committed by Automerger Merge Worker
parent 2f40bdb88f 7a64585e90
commit 6d855c7830
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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);
}
}