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

Commit c80d7894 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-14c0d0dd1ab9408c8fbd89013e2295b5" into tm-dev am: 7436573a 

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



Change-Id: I8fc15880588b543b337fcf1a779a59d90f7cc2ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ec2da93 7436573a

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

+4 −3
Original line number Diff line number Diff line
@@ -96,12 +96,13 @@ public class TvPipBoundsAlgorithm extends PipBoundsAlgorithm { 
                    "%s: getEntryDestinationBounds()", TAG);

        }

        updateExpandedPipSize();

        if (mTvPipBoundsState.isTvExpandedPipSupported()

        final boolean isPipExpanded = mTvPipBoundsState.isTvExpandedPipSupported()

                && mTvPipBoundsState.getDesiredTvExpandedAspectRatio() != 0

                && !mTvPipBoundsState.isTvPipManuallyCollapsed()) {

                && !mTvPipBoundsState.isTvPipManuallyCollapsed();

        if (isPipExpanded) {

            updateGravityOnExpandToggled(Gravity.NO_GRAVITY, true);

            mTvPipBoundsState.setTvPipExpanded(true);

        }

        mTvPipBoundsState.setTvPipExpanded(isPipExpanded);

        return getTvPipBounds().getBounds();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ public class TvPipMenuView extends FrameLayout implements View.OnClickListener { 
     */

    private boolean actionsMatch(RemoteAction action1, RemoteAction action2) {

        if (action1 == action2) return true;

        if (action1 == null) return false;

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

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

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

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