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

Commit 0a7cff9f authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Propagate PiP param change on RemoteAction update" into tm-qpr-dev am: 82f8dc17 

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



Change-Id: Ie5c6872ae5d2b9adf2b59bb042a4a387bcfae7b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0750d55 82f8dc17

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

+3 −1
Original line number Diff line number Diff line
@@ -83,7 +83,9 @@ public class PipUtils { 
    public static boolean remoteActionsMatch(RemoteAction action1, RemoteAction action2) {

        if (action1 == action2) return true;

        if (action1 == null || action2 == null) return false;

        return Objects.equals(action1.getTitle(), action2.getTitle())

        return action1.isEnabled() == action2.isEnabled()

                && action1.shouldShowIcon() == action2.shouldShowIcon()

                && Objects.equals(action1.getTitle(), action2.getTitle())

                && Objects.equals(action1.getContentDescription(), action2.getContentDescription())

                && Objects.equals(action1.getActionIntent(), action2.getActionIntent());

    }