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

Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c2c

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

Change-Id: Ib569729dd607d60d0897da86095bc3092ba86974
This commit is contained in:
Beth Thibodeau
2020-06-12 03:51:21 +00:00
committed by Automerger Merge Worker
parent 13212d164e fd10b83c2c
commit bcd7297083
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
View File

@@ -302,11 +302,14 @@ public class MediaControlPanel {
button.setContentDescription(mediaAction.getContentDescription()); button.setContentDescription(mediaAction.getContentDescription());
Runnable action = mediaAction.getAction(); Runnable action = mediaAction.getAction();
if (action == null) {
button.setEnabled(false);
} else {
button.setEnabled(true);
button.setOnClickListener(v -> { button.setOnClickListener(v -> {
if (action != null) {
action.run(); action.run();
}
}); });
}
boolean visibleInCompat = actionsWhenCollapsed.contains(i); boolean visibleInCompat = actionsWhenCollapsed.contains(i);
setVisibleAndAlpha(collapsedSet, actionId, visibleInCompat); setVisibleAndAlpha(collapsedSet, actionId, visibleInCompat);
setVisibleAndAlpha(expandedSet, actionId, true /*visible */); setVisibleAndAlpha(expandedSet, actionId, true /*visible */);

11
packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
View File

@@ -366,15 +366,20 @@ class MediaDataManager @Inject constructor(
actionsToShowCollapsed.remove(index) actionsToShowCollapsed.remove(index)
continue continue
} }
val mediaAction = MediaAction( val runnable = if (action.actionIntent != null) {
action.getIcon().loadDrawable(packageContext),
Runnable { Runnable {
try { try {
action.actionIntent.send() action.actionIntent.send()
} catch (e: PendingIntent.CanceledException) { } catch (e: PendingIntent.CanceledException) {
Log.d(TAG, "Intent canceled", e) Log.d(TAG, "Intent canceled", e)
} }
}, }
} else {
null
}
val mediaAction = MediaAction(
action.getIcon().loadDrawable(packageContext),
runnable,
action.title) action.title)
actionIcons.add(mediaAction) actionIcons.add(mediaAction)
} }