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

Merge "Disallow loading icon from content URI to PipMenu" into sc-dev

Browse Source
This commit is contained in:
Hongwei Wang
2023-07-26 19:35:00 +00:00
committed by Android (Google) Code Review
parent 0a11e8a7c4 4bf71d74fc
commit 1f2e080f1b
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
View File

@@ -41,6 +41,7 @@ import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@@ -462,6 +463,11 @@ public class PipMenuView extends FrameLayout {
final PipMenuActionView actionView = final PipMenuActionView actionView =
(PipMenuActionView) mActionsGroup.getChildAt(i); (PipMenuActionView) mActionsGroup.getChildAt(i);
final int iconType = action.getIcon().getType();
if (iconType == Icon.TYPE_URI || iconType == Icon.TYPE_URI_ADAPTIVE_BITMAP) {
// Disallow loading icon from content URI
actionView.setImageDrawable(null);
} else {
// TODO: Check if the action drawable has changed before we reload it // TODO: Check if the action drawable has changed before we reload it
action.getIcon().loadDrawableAsync(mContext, d -> { action.getIcon().loadDrawableAsync(mContext, d -> {
if (d != null) { if (d != null) {
@@ -469,6 +475,7 @@ public class PipMenuView extends FrameLayout {
actionView.setImageDrawable(d); actionView.setImageDrawable(d);
} }
}, mMainHandler); }, mMainHandler);
}
actionView.setContentDescription(action.getContentDescription()); actionView.setContentDescription(action.getContentDescription());
if (action.isEnabled()) { if (action.isEnabled()) {
actionView.setOnClickListener(v -> { actionView.setOnClickListener(v -> {