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

Commit 71d72d13 authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

Use color overlay for fixed rotation in btn nav 

Use color overlay instead of app icon overlay with fixed rotation
on in button navigation mode. This is a temporary workaround
to avoid app icon squashing due to animator issue in btn nav
with non zero rotation.

Before: http://recall/-/da2uuq57YtQRpR4N9NryZR/dFiyWX27i9rEPm3VTvj4Or
After: http://recall/-/da2uuq57YtQRpR4N9NryZR/gUl5wasVU7z8B9JKQYpWRk

Bug: 319286295
Test: manually enter PiP w/ fixed rotation in btn nav and srcRectHint=null
Change-Id: Id7c8da71714bc34dd4a9b679c96b6b32d6bac6de
parent 25bde8f1

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

+4 −2
Original line number Diff line number Diff line
@@ -987,10 +987,12 @@ public class PipTransition extends PipTransitionController { 
                    0 /* startingAngle */, rotationDelta);

            if (sourceHintRect == null) {

                // We use content overlay when there is no source rect hint to enter PiP use bounds

                // animation.

                // animation. We also temporarily disallow app icon overlay and use color overlay

                // instead when in fixed rotation enter PiP in button nav with no sourceRectHint.

                // TODO(b/319286295): Fix App Icon Overlay animation in fixed rotation in btn nav.

                // TODO(b/272819817): cleanup the null-check and extra logging.

                final boolean hasTopActivityInfo = taskInfo.topActivityInfo != null;

                if (hasTopActivityInfo) {

                if (hasTopActivityInfo && mFixedRotationState != FIXED_ROTATION_TRANSITION) {

                    animator.setAppIconContentOverlay(

                            mContext, currentBounds, destinationBounds, taskInfo.topActivityInfo,

                            mPipBoundsState.getLauncherState().getAppIconSizePx());