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 am: 1f2e080f1b am: 0fbf93b9f6

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

Change-Id: Ide4509e9405cc7a4099e34ca8e18b3bce4777a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2023-07-26 21:02:49 +00:00
committed by Automerger Merge Worker
parent 88601d2e85 0fbf93b9f6
commit 31262f43e4
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,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;
@@ -488,13 +489,19 @@ public class PipMenuView extends FrameLayout {
final PipMenuActionView actionView = final PipMenuActionView actionView =
(PipMenuActionView) mActionsGroup.getChildAt(i); (PipMenuActionView) mActionsGroup.getChildAt(i);
// TODO: Check if the action drawable has changed before we reload it final int iconType = action.getIcon().getType();
action.getIcon().loadDrawableAsync(mContext, d -> { if (iconType == Icon.TYPE_URI || iconType == Icon.TYPE_URI_ADAPTIVE_BITMAP) {
if (d != null) { // Disallow loading icon from content URI
d.setTint(Color.WHITE); actionView.setImageDrawable(null);
actionView.setImageDrawable(d); } else {
} // TODO: Check if the action drawable has changed before we reload it
}, mMainHandler); action.getIcon().loadDrawableAsync(mContext, d -> {
if (d != null) {
d.setTint(Color.WHITE);
actionView.setImageDrawable(d);
}
}, mMainHandler);
}
actionView.setContentDescription(action.getContentDescription()); actionView.setContentDescription(action.getContentDescription());
if (action.isEnabled()) { if (action.isEnabled()) {
actionView.setOnClickListener(v -> { actionView.setOnClickListener(v -> {