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

Commit ed49025e authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Prevent extraneous saving of pinned snap fraction." into pi-dev 

am: 95f29374

Change-Id: Iff1a7d1f397951636dc938db722109122655cb89
parents a34134c9 95f29374

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ message StackProto { 
  optional float adjust_ime_amount = 10;

  optional float adjust_divider_amount = 11;

  optional .android.graphics.RectProto adjusted_bounds = 12;

  optional bool animating_bounds = 13;

}



/* represents Task */

services/core/java/com/android/server/wm/AppWindowToken.java

+2 −1
Original line number Diff line number Diff line
@@ -1312,7 +1312,8 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        if (prevWinMode != WINDOWING_MODE_UNDEFINED && winMode == WINDOWING_MODE_PINNED) {

            // Entering PiP from fullscreen, reset the snap fraction

            mDisplayContent.mPinnedStackControllerLocked.resetReentrySnapFraction(this);

        } else if (prevWinMode == WINDOWING_MODE_PINNED && winMode != WINDOWING_MODE_UNDEFINED) {

        } else if (prevWinMode == WINDOWING_MODE_PINNED && winMode != WINDOWING_MODE_UNDEFINED

                && !isHidden()) {

            // Leaving PiP to fullscreen, save the snap fraction based on the pre-animation bounds

            // for the next re-entry into PiP (assuming the activity is not hidden or destroyed)

            final TaskStack pinnedStack = mDisplayContent.getPinnedStack();

services/core/java/com/android/server/wm/TaskStack.java

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import static com.android.server.wm.StackProto.ADJUSTED_BOUNDS; 
import static com.android.server.wm.StackProto.ADJUSTED_FOR_IME;

import static com.android.server.wm.StackProto.ADJUST_DIVIDER_AMOUNT;

import static com.android.server.wm.StackProto.ADJUST_IME_AMOUNT;

import static com.android.server.wm.StackProto.ANIMATING_BOUNDS;

import static com.android.server.wm.StackProto.ANIMATION_BACKGROUND_SURFACE_IS_DIMMING;

import static com.android.server.wm.StackProto.BOUNDS;

import static com.android.server.wm.StackProto.DEFER_REMOVAL;
@@ -1363,6 +1364,7 @@ public class TaskStack extends WindowContainer<Task> implements 
        proto.write(ADJUST_IME_AMOUNT, mAdjustImeAmount);

        proto.write(ADJUST_DIVIDER_AMOUNT, mAdjustDividerAmount);

        mAdjustedBounds.writeToProto(proto, ADJUSTED_BOUNDS);

        proto.write(ANIMATING_BOUNDS, mBoundsAnimating);

        proto.end(token);

    }