Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed142fe authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Disallow loading icon from content URI to PipMenu" into tm-dev am: b986ddc4 am: 59ad0188 

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



Change-Id: Icad1266bb7d23a7a9e02580e30e8976766b45a81
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c366531 59ad0188

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

+14 −7
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.content.Intent; 
import android.graphics.Color;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Icon;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;
@@ -513,6 +514,11 @@ public class PipMenuView extends FrameLayout { 
                    final boolean isCloseAction = mCloseAction != null && Objects.equals(

                            mCloseAction.getActionIntent(), action.getActionIntent());



                    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

                        action.getIcon().loadDrawableAsync(mContext, d -> {

                            if (d != null) {
@@ -520,6 +526,7 @@ public class PipMenuView extends FrameLayout { 
                                actionView.setImageDrawable(d);

                            }

                        }, mMainHandler);

                    }

                    actionView.setCustomCloseBackgroundVisibility(

                            isCloseAction ? View.VISIBLE : View.GONE);

                    actionView.setContentDescription(action.getContentDescription());