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

Browse Source
This commit is contained in:
Shaowei Shen
2023-03-23 10:25:44 +00:00
committed by Android (Google) Code Review
parent c6b158b86a 016da6b2b4
commit 7a64585e90
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); updateDeviceStatusIcon(deviceStatusIcon);
mStatusIcon.setVisibility(View.VISIBLE); mStatusIcon.setVisibility(View.VISIBLE);
} }
updateTwoLineLayoutContentAlpha( updateSingleLineLayoutContentAlpha(
updateClickActionBasedOnSelectionBehavior(device) updateClickActionBasedOnSelectionBehavior(device)
? DEVICE_CONNECTED_ALPHA : DEVICE_DISCONNECTED_ALPHA); ? DEVICE_CONNECTED_ALPHA : DEVICE_DISCONNECTED_ALPHA);
} else { } else {
@@ -364,6 +364,12 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter {
mStatusIcon.setAlpha(alphaValue); mStatusIcon.setAlpha(alphaValue);
} }
private void updateSingleLineLayoutContentAlpha(float alphaValue) {
mTitleIcon.setAlpha(alphaValue);
mTitleText.setAlpha(alphaValue);
mStatusIcon.setAlpha(alphaValue);
}
private void updateEndClickAreaAsSessionEditing(MediaDevice device) { private void updateEndClickAreaAsSessionEditing(MediaDevice device) {
mEndClickIcon.setOnClickListener(null); mEndClickIcon.setOnClickListener(null);
mEndTouchArea.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.putExtra(EXTRA_ROUTE_ID, routeId);
launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mCallback.dismissDialog(); mCallback.dismissDialog();
mContext.startActivity(launchIntent);
mActivityStarter.startActivity(launchIntent, true, controller); mActivityStarter.startActivity(launchIntent, true, controller);
} }
} }