Commit: f3b4e6b21d6372c2118cf7f200469c897b296929 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Révision: f3b4e6b21d6372c2118cf7f200469c897b296929 (tree)
• l'heure: 2020-06-12 00:24:15
• Auteur: utzcoz <utzcoz@outl...>
• Commiter: utzcoz

Message de Log

Support persist window bounds

1. Add methods in WMS to store/restore window bounds in

SharedPreferences.

2. When resizing/moving window, save its value.
3. When launching window, use saved value as launch bounds.

This patch also disable the launch bounds in ActivityOptions, because
the starter doesn't know the new window bounds after resizing. The
Taskbar sets the launch bounds to the center position of screen
forcibly, and it will cause saved bounds can't work. Before finding a
solution to let Taskbar to manage freeform window bounds, we will
disable launch bounds of ActivityOptions.

Signed-off-by: utzcoz <[e-mail]>

Change Summary

• modified: services/core/java/com/android/server/am/ActivityLaunchParamsModifier.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/WindowManagerService.java

Modification

--- 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/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/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
 }