Commit: c837c92b2873f847c5fe1b66d812b2217a5be143 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revision: c837c92b2873f847c5fe1b66d812b2217a5be143 (tree)
• Zeit: 2020-07-08 00:40:06
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge branch 'boringdroid-x86-9.0.0' of https://github.com/boringdroid/platform_frameworks_base into pie-x86

Ändern Zusammenfassung

• modified: config/hiddenapi-private-dex.txt
• modified: core/java/com/android/internal/policy/BackdropFrameRenderer.java
• modified: core/java/com/android/internal/policy/DecorView.java
• modified: core/java/com/android/internal/widget/DecorCaptionView.java
• add: core/res/res/drawable/decor_back_button_dark.xml
• add: core/res/res/drawable/decor_back_button_light.xml
• modified: core/res/res/layout/decor_caption.xml
• modified: core/res/res/values/arrays.xml
• modified: core/res/res/values/strings.xml
• modified: core/res/res/values/symbols.xml
• modified: services/core/java/com/android/server/am/ActivityLaunchParamsModifier.java
• modified: services/core/java/com/android/server/am/ActivityStack.java
• modified: services/core/java/com/android/server/am/TaskLaunchParamsModifier.java
• modified: services/core/java/com/android/server/am/TaskRecord.java
• modified: services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
• modified: services/core/java/com/android/server/wm/WindowManagerService.java
• modified: services/core/java/com/android/server/wm/WindowStateAnimator.java

Diff

--- a/config/hiddenapi-private-dex.txt
+++ b/config/hiddenapi-private-dex.txt
@@ -113705,6 +113705,8 @@ Lcom/android/internal/R$drawable;->decor_close_button_dark:I
 Lcom/android/internal/R$drawable;->decor_close_button_light:I
 Lcom/android/internal/R$drawable;->decor_maximize_button_dark:I
 Lcom/android/internal/R$drawable;->decor_maximize_button_light:I
+Lcom/android/internal/R$drawable;->decor_back_button_dark:I
+Lcom/android/internal/R$drawable;->decor_back_button_light:I
 Lcom/android/internal/R$drawable;->default_lock_wallpaper:I
 Lcom/android/internal/R$drawable;->default_wallpaper:I
 Lcom/android/internal/R$drawable;->dialog_frame:I

--- a/core/java/com/android/internal/policy/BackdropFrameRenderer.java
+++ b/core/java/com/android/internal/policy/BackdropFrameRenderer.java
@@ -331,8 +331,17 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame
 
         // Since the surface is spanning the entire screen, we have to add the start offset of
         // the bounds to get to the surface location.
-        final int left = mLastXOffset + newBounds.left;
-        final int top = mLastYOffset + newBounds.top;
+        // region @boringdroid
+        // In FrameBuilder.cpp, the system will calculate the distance between content
+        // drawing bound and back drop frame bounds, and translate content drawing bounds
+        // to back drop left and top position to draw it, what will cause another content
+        // jumps. So we should keep the left and top position with content drawing bounds
+        // to avoid another part content jumps.
+        // final int left = mLastXOffset + newBounds.left;
+        // final int top = mLastYOffset + newBounds.top;
+        final int left = mLastXOffset;
+        final int top = mLastYOffset;
+        // endregion
         final int width = newBounds.width();
         final int height = newBounds.height();
 

--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -1994,7 +1994,12 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
     }
 
     private void setLightDecorCaptionShade(DecorCaptionView view) {
-		view.findViewById(R.id.pip_window).setBackgroundResource(
+        // region @boringdroid
+        view.findViewById(R.id.back_window).setBackgroundResource(
+                R.drawable.decor_back_button_light
+        );
+        // endregion
+        view.findViewById(R.id.pip_window).setBackgroundResource(
                 R.drawable.decor_pip_button_light);
         view.findViewById(R.id.minimize_window).setBackgroundResource(
                 R.drawable.decor_minimize_button_light);
@@ -2005,6 +2010,11 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
     }
 
     private void setDarkDecorCaptionShade(DecorCaptionView view) {
+        // region @boringdroid
+        view.findViewById(R.id.back_window).setBackgroundResource(
+                R.drawable.decor_back_button_dark
+        );
+        // endregion
 		view.findViewById(R.id.pip_window).setBackgroundResource(
                 R.drawable.decor_pip_button_dark);
 		view.findViewById(R.id.minimize_window).setBackgroundResource(
@@ -2231,6 +2241,12 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
             mElevationAdjustedForStack = false;
         }
 
+        // region @boringdroid
+        if ((windowingMode == WINDOWING_MODE_FREEFORM) && isResizing()) {
+            elevation = dipToPx(DECOR_SHADOW_FOCUSED_HEIGHT_IN_DIP);
+            mElevationAdjustedForStack = true;
+        }
+        // endregion
         // Don't change the elevation if we didn't previously adjust it for the stack it was in
         // or it didn't change.
         if ((wasAdjustedForStack || mElevationAdjustedForStack)

--- a/core/java/com/android/internal/widget/DecorCaptionView.java
+++ b/core/java/com/android/internal/widget/DecorCaptionView.java
@@ -16,6 +16,7 @@
 
 package com.android.internal.widget;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Rect;
@@ -107,6 +108,10 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
     private final Rect mMinimizeRect = new Rect();
     private final Rect mPipRect = new Rect();
     private View mClickTarget;
+    // region @boringdroid
+    private View mBack;
+    private final Rect mBackRect = new Rect();
+    // endregion
 
     public DecorCaptionView(Context context) {
         super(context);
@@ -147,6 +152,9 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
         // By changing the outline provider to BOUNDS, the window can remove its
         // background without removing the shadow.
         mOwner.getDecorView().setOutlineProvider(ViewOutlineProvider.BOUNDS);
+        // region @boringdroid
+        mBack = findViewById(R.id.back_window);
+        // endregion
         mPip = findViewById(R.id.pip_window);
         mMinimize = findViewById(R.id.minimize_window);
         mMaximize = findViewById(R.id.maximize_window);
@@ -160,6 +168,11 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             final int x = (int) ev.getX();
             final int y = (int) ev.getY();
+            // region @boringdroid
+            if (mBackRect.contains(x, y)) {
+                mClickTarget = mBack;
+            }
+            // endregion
             // Only offset y for containment tests because the actual views are already translated.
             if (mPipRect.contains(x, y)) {
                 mClickTarget = mPip;
@@ -311,12 +324,18 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
         if (mCaption.getVisibility() != View.GONE) {
             mCaption.layout(0, 0, mCaption.getMeasuredWidth(), mCaption.getMeasuredHeight());
             captionHeight = mCaption.getBottom() - mCaption.getTop();
+            // region @boringdroid
+            mBack.getHitRect(mBackRect);
+            // endregion
             mPip.getHitRect(mPipRect);
             mMinimize.getHitRect(mMinimizeRect);
             mMaximize.getHitRect(mMaximizeRect);
             mClose.getHitRect(mCloseRect);
         } else {
             captionHeight = 0;
+            // region @boringdroid
+            mBackRect.setEmpty();
+            // endregion
             mPipRect.setEmpty();
             mMinimizeRect.setEmpty();
             mMaximizeRect.setEmpty();
@@ -333,8 +352,12 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
         }
 
         // This assumes that the caption bar is at the top.
-        mOwner.notifyRestrictedCaptionAreaCallback(mPip.getLeft(), mMaximize.getTop(),
+        // region @boringdroid
+        // mOwner.notifyRestrictedCaptionAreaCallback(mPip.getLeft(), mMaximize.getTop(),
+        //         mClose.getRight(), mClose.getBottom());
+        mOwner.notifyRestrictedCaptionAreaCallback(mBack.getLeft(), mBack.getTop(),
                 mClose.getRight(), mClose.getBottom());
+        // endregion
     }
     /**
      * Determine if the workspace is entirely covered by the window.
@@ -351,7 +374,14 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
      **/
     private void updateCaptionVisibility() {
         // Don't show the caption if the window has e.g. entered full screen.
-        boolean invisible = isFillingScreen() || !mShow;
+        // region @boringdroid
+        // If mShow is true, the window is in freeform window, because only freeform
+        // window can show decor caption. In freeform window mode, we should ignore
+        // system ui visibility. If we consider it, the decor caption will dismiss
+        // if we resize window with fullscreen system ui visibility, such as Clock.
+        // boolean invisible = isFillingScreen() || !mShow;
+        boolean invisible = !mShow;
+        // endregion
         mCaption.setVisibility(invisible ? GONE : VISIBLE);
         mCaption.setOnTouchListener(this);
     }
@@ -436,6 +466,16 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
 
     @Override
     public boolean onSingleTapUp(MotionEvent e) {
+        // region @boringdroid
+        if (mClickTarget == mBack) {
+            Window.WindowControllerCallback callback = mOwner.getWindowControllerCallback();
+            if (callback instanceof Activity) {
+                Activity activity = (Activity) callback;
+                activity.onBackPressed();
+            }
+            return true;
+        }
+        // endregion
         if (mClickTarget == mMinimize) {
             minimizeWindow();
         } else if (mClickTarget == mPip) {

--- /dev/null
+++ b/core/res/res/drawable/decor_back_button_dark.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+     Copyright (C) 2020 boringdroid
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="32.0dp"
+        android:viewportWidth="32.0"
+        android:viewportHeight="32.0"
+        android:tint="@color/decor_button_dark_color">
+    <group android:scaleX="0.5"
+           android:scaleY="0.5"
+           android:translateX="8.0"
+           android:translateY="8.0">
+        <path
+            android:fillColor="@color/white"
+            android:pathData="M2.0,16.0l28.0,14.0l0.0,-28z" />
+    </group>
+</vector>
+
+

--- /dev/null
+++ b/core/res/res/drawable/decor_back_button_light.xml
@@ -0,0 +1,31 @@
+<!-- Copyright (C) 2015 The Android Open Source Project
+     Copyright (C) boringdroid
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32.0dp"
+        android:height="32.0dp"
+        android:viewportWidth="32.0"
+        android:viewportHeight="32.0"
+        android:tint="@color/decor_button_light_color">
+    <group android:scaleX="0.5"
+           android:scaleY="0.5"
+           android:translateX="8.0"
+           android:translateY="8.0">
+        <path
+            android:fillColor="@color/white"
+            android:pathData="M2.0,16.0l28.0,14.0l0.0,-28z" />
+    </group>
+</vector>

--- a/core/res/res/layout/decor_caption.xml
+++ b/core/res/res/layout/decor_caption.xml
@@ -30,6 +30,22 @@
             android:background="@drawable/decor_caption_title"
             android:focusable="false"
             android:descendantFocusability="blocksDescendants" >
+        <!-- region @boringdroid -->
+        <Button
+            android:id="@+id/back_window"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_margin="5dp"
+            android:padding="4dp"
+            android:layout_gravity="center_vertical|start"
+            android:contentDescription="@string/back_button_text"
+            android:background="@drawable/decor_back_button_dark" />
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@color/transparent" />
+        <!-- endregion -->
         <Button
                 android:id="@+id/pip_window"
                 android:layout_width="32dp"

--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -143,6 +143,10 @@
       <item>@drawable/decor_minimize_button_light</item>
       <item>@drawable/decor_pip_button_dark</item>
       <item>@drawable/decor_pip_button_light</item>
+      <!-- region @boringdroid -->
+      <item>@drawable/decor_back_button_dark</item>
+      <item>@drawable/decor_back_button_light</item>
+      <!-- endregion -->
    </array>
 
     <!-- Used in LocalePicker -->

--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -4671,6 +4671,9 @@
     <string name="floating_toolbar_close_overflow_description">Close overflow</string>
 
     <!-- Free style window strings -->
+    <!-- region @boringdroid -->
+    <string name="back_button_text">Back</string>
+    <!-- endregion -->
     <!-- Accessibility text for the minimize window button -->
     <string name="pip_button_text">Picture In Picture</string>
     <!-- Accessibility text for the minimize window button -->

--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2237,6 +2237,11 @@
   <java-symbol type="drawable" name="decor_maximize_button_light" />
   <java-symbol type="drawable" name="decor_pip_button_dark" />
   <java-symbol type="drawable" name="decor_pip_button_light" />
+  <!-- region @boringdroid -->
+  <java-symbol type="id" name="back_window" />
+  <java-symbol type="drawable" name="decor_back_button_dark" />
+  <java-symbol type="drawable" name="decor_back_button_light" />
+  <!-- endregion -->
   <java-symbol type="color" name="decor_button_dark_color" />
   <java-symbol type="color" name="decor_button_light_color" />
 

--- a/services/core/java/com/android/server/am/ActivityLaunchParamsModifier.java
+++ b/services/core/java/com/android/server/am/ActivityLaunchParamsModifier.java
@@ -49,7 +49,13 @@ public class ActivityLaunchParamsModifier implements LaunchParamsModifier {
             return RESULT_SKIP;
         }
 
-        final Rect bounds = options.getLaunchBounds();
+        // region @boringdroid
+        // Leave window bounds to wms/ams, and ignore launch bounds from starter.
+        // The starter doesn't know the current window bounds after resizing, so launch
+        // bounds will reset freeform window bounds to the default state.
+        // final Rect bounds = options.getLaunchBounds();
+        final Rect bounds = null;
+        // endregion
 
         // Bounds weren't valid.
         if (bounds == null || bounds.isEmpty()) {

--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -620,6 +620,15 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
                 }
             }
 
+            // region @boringdroid
+            // Current logic, if we change windowing mode from freeform to fullscreen, getOverrideBounds() will
+            // return empty, the same as mTmpRect2, which doesn't trigger resize for window. So if current mode
+            // is freeform, and new mode is fullscreen, we should resize window forcibly to avoid rigid
+            // rendering problem.
+            if (mTmpRect2.isEmpty() && currentMode == WINDOWING_MODE_FREEFORM) {
+                resize(mTmpRect2, null /* tempTaskBounds */, null /* tempTaskInsetBounds */);
+            }
+            // endregion
             if (!Objects.equals(getOverrideBounds(), mTmpRect2)) {
                 resize(mTmpRect2, null /* tempTaskBounds */, null /* tempTaskInsetBounds */);
             }

--- a/services/core/java/com/android/server/am/TaskLaunchParamsModifier.java
+++ b/services/core/java/com/android/server/am/TaskLaunchParamsModifier.java
@@ -92,6 +92,13 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier {
         final Rect resultBounds = outParams.mBounds;
 
         if (layout == null) {
+            // region @boringdroid
+            // For freeform window, we should use its launch bounds instead of recauclate its bounds.
+            if (task.inFreeformWindowingMode()) {
+                task.updateOverrideConfiguration(task.getLaunchBounds());
+                return RESULT_CONTINUE;
+            }
+            // endregion
             positionCenter(tasks, mAvailableRect, getFreeformWidth(mAvailableRect),
                     getFreeformHeight(mAvailableRect), resultBounds);
             return RESULT_CONTINUE;
@@ -118,6 +125,13 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier {
             // center.
             Slog.w(TAG, "Received unsupported gravity: " + layout.gravity
                     + ", positioning in the center instead.");
+            // region @boringdroid
+            // For freeform window, we should use its launch bounds instead of recauclate its bounds.
+            if (task.inFreeformWindowingMode()) {
+                task.updateOverrideConfiguration(task.getLaunchBounds());
+                return RESULT_CONTINUE;
+            }
+            // endregion
             positionCenter(tasks, mAvailableRect, width, height, resultBounds);
         }
 

--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -548,6 +548,10 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
                 }
             }
             mWindowContainerController.resize(kept, forced);
+            // region @boringdroid
+            // After window resizes its bounds(real resize and move), we should save the window bounds.
+            saveTaskBounds();
+            // endregion
 
             Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
             return kept;
@@ -559,7 +563,31 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
     // TODO: Investigate combining with the resize() method above.
     void resizeWindowContainer() {
         mWindowContainerController.resize(false /* relayout */, false /* forced */);
+        // region @boringdroid
+        // After window resizes its bounds(real resize and move), we should save the window bounds.
+        saveTaskBounds();
+        // endregion
+    }
+    // region @boringdroid
+    private void saveTaskBounds() {
+        Rect savedBounds = new Rect();
+        mWindowContainerController.getBounds(savedBounds);
+        String packageName = null;
+        if (realActivity != null) {
+            packageName = realActivity.getPackageName();
+        } else if (getRootActivity() != null) {
+            packageName = getRootActivity().packageName;
+        }
+        if (mStack != null
+                && mStack.getWindowingMode() == WINDOWING_MODE_FREEFORM
+                && !savedBounds.isEmpty()
+                && packageName != null) {
+            WindowManagerService
+                    .getWMSInstance()
+                    .savePackageWindowBounds(packageName, savedBounds);
+        }
     }
+    // endregion
 
     void getWindowContainerBounds(Rect bounds) {
         mWindowContainerController.getBounds(bounds);
@@ -1895,6 +1923,32 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
         } else if (!getWindowConfiguration().persistTaskBounds()) {
             return mStack.getOverrideBounds();
         }
+        // region @boringdroid
+        if (mLastNonFullscreenBounds == null) {
+            String packageName = null;
+            if (realActivity != null) {
+                packageName = realActivity.getPackageName();
+            } else if (getRootActivity() != null) {
+                packageName = getRootActivity().packageName;
+            }
+            mLastNonFullscreenBounds =
+                    packageName != null ?
+                            WindowManagerService
+                                    .getWMSInstance()
+                                    .getPackageWindowBounds(packageName)
+                            : new Rect();
+            if (!mLastNonFullscreenBounds.isEmpty()) {
+                return mLastNonFullscreenBounds;
+            }
+            getParent().getBounds(mLastNonFullscreenBounds);
+            int width = mLastNonFullscreenBounds.width() / 2;
+            int height = mLastNonFullscreenBounds.height() / 2;
+            int left = mLastNonFullscreenBounds.left + width / 2;
+            int top = mLastNonFullscreenBounds.top + height / 2;
+            mLastNonFullscreenBounds.set(left, top , left + width, top + height);
+            adjustForMinimalTaskDimensions(mLastNonFullscreenBounds);
+        }
+        // endregion
         return mLastNonFullscreenBounds;
     }
 

--- a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
+++ b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
@@ -104,6 +104,22 @@ public class TaskTapPointerEventListener implements PointerEventListener {
                 }
             }
             break;
+
+            // region @boringdroid
+            // We should reset pointer icon type when hover exit task. If we start freeform
+            // window from Taskbar, and move pointer to resize region, the pointer type will
+            // change to TYPE_*_DOUBLE_ARROW, but when we move pointer outer freeform window
+            // resize region, the pointer type will keep to TYPE_*_DOUBLE_ARROW. The reset
+            // operation will help to fix this problem.
+            case MotionEvent.ACTION_HOVER_EXIT: {
+                mPointerIconType = TYPE_NOT_SPECIFIED;
+                final int x = (int) motionEvent.getX();
+                final int y = (int) motionEvent.getY();
+                mService.mH.obtainMessage(H.RESTORE_POINTER_ICON,
+                        x, y, mDisplayContent).sendToTarget();
+            }
+            break;
+            // endregion
         }
     }
 

--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -126,6 +126,7 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManagerInternal;
@@ -148,6 +149,7 @@ import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Debug;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.IRemoteCallback;
@@ -169,6 +171,7 @@ import android.os.SystemProperties;
 import android.os.SystemService;
 import android.os.Trace;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.os.WorkSource;
 import android.provider.Settings;
 import android.text.format.DateUtils;
@@ -7601,4 +7604,66 @@ public class WindowManagerService extends IWindowManager.Stub
             }
         }
     }
+    // region @boringdroid
+    private static final String PACKAGE_WINDOW_BOUNDS_NAME = "package-window-bounds";
+
+    private static boolean isDataSystemDirNotReady(Context context) {
+        UserManager userManager = context.getSystemService(UserManager.class);
+        return !(userManager != null && userManager.isUserUnlockingOrUnlocked(UserHandle.myUserId()));
+    }
+
+    private static File getPackageWindowBoundsName() {
+        return new File(
+                Environment.getDataSystemCeDirectory(UserHandle.myUserId())
+                        + File.separator + PACKAGE_WINDOW_BOUNDS_NAME
+        );
+    }
+
+    /**
+     * @hide
+     */
+    public static WindowManagerService getWMSInstance() {
+        return getInstance();
+    }
+
+    /**
+     * @hide
+     */
+    public void savePackageWindowBounds(String packageName, Rect bounds) {
+        if (isDataSystemDirNotReady(mContext)) {
+            Slog.e(TAG, "Calling savePackageWindowBounds with package " + packageName
+                    + ", and bounds " + bounds + ", before file is ready");
+            return;
+        }
+        SharedPreferences sharedPreferences =
+                mContext.getSharedPreferences(getPackageWindowBoundsName(), Context.MODE_PRIVATE);
+        Rect tempBounds = new Rect(bounds);
+        sharedPreferences
+                .edit()
+                .putInt(packageName + "-left", tempBounds.left)
+                .putInt(packageName + "-top", tempBounds.top)
+                .putInt(packageName + "-right", tempBounds.right)
+                .putInt(packageName + "-bottom", tempBounds.bottom)
+                .apply();
+    }
+
+    /**
+     * @hide
+     */
+    public Rect getPackageWindowBounds(String packageName) {
+        if (isDataSystemDirNotReady(mContext)) {
+            Slog.e(TAG, "Calling getPackageWindowBounds with package " + packageName
+                    + ", before file is ready");
+            return new Rect();
+        }
+        SharedPreferences sharedPreferences =
+                mContext.getSharedPreferences(getPackageWindowBoundsName(), Context.MODE_PRIVATE);
+        return new Rect(
+                sharedPreferences.getInt(packageName + "-left", 0),
+                sharedPreferences.getInt(packageName + "-top", 0),
+                sharedPreferences.getInt(packageName + "-right", 0),
+                sharedPreferences.getInt(packageName + "-bottom", 0)
+        );
+    }
+    // endregion
 }

--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -798,6 +798,11 @@ class WindowStateAnimator {
             return false;
         }
 
+        // region @boringdroid
+        if (w.inFreeformWindowingMode()) {
+            return false;
+        }
+        // endregion
         // If we're animating, the wallpaper should only
         // be updated at the end of the animation.
         if (w.mAttrs.type == TYPE_WALLPAPER) {