commit 87b21722c2336490ecf8b66f6acfc46ce8cc6f46
author Chong Zhang <chz@google.com> Mon Sep 21 15:39:51 2015 -0700
committer Chong Zhang <chz@google.com> Tue Sep 22 00:46:02 2015 +0000
tree 68fda659c27e36c4946b8930af67b9d7633f32e1
parent 9e6b09121364ad507e02639d42dff970bf8eeeb6

Change resizeTask's parameter resizedByUser to constants

to indicate who initiated the resize, or if the resize should be forced.

Change-Id: Ic7021f76bec677027cbf27deeb63f92ea911a75c

core/java/android/app/ActivityManager.java

diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 9ef51c8..4191dce 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -468,6 +468,29 @@
      */
     public static final int DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT = 1;
 
+
+    /**
+     * Input parameter to {@link android.app.IActivityManager#resizeTask} which indicates
+     * that the resize is from the window manager (instead of the user).
+     * @hide
+     */
+    public static final int RESIZE_MODE_SYSTEM = 0;
+
+    /**
+     * Input parameter to {@link android.app.IActivityManager#resizeTask} which indicates
+     * that the resize is initiated by the user (most likely via a drag action on the
+     * window's edge or corner).
+     * @hide
+     */
+    public static final int RESIZE_MODE_USER   = 1;
+
+    /**
+     * Input parameter to {@link android.app.IActivityManager#resizeTask} which indicates
+     * that the resize should be performed even if the bounds appears unchanged.
+     * @hide
+     */
+    public static final int RESIZE_MODE_FORCED = 2;
+
     /** @hide */
     public int getFrontActivityScreenCompatMode() {
         try {

core/java/android/app/ActivityManagerNative.java

diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index da6fc59..3864a4b 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -2452,9 +2452,9 @@
         case RESIZE_TASK_TRANSACTION: {
             data.enforceInterface(IActivityManager.descriptor);
             int taskId = data.readInt();
-            final boolean resizedByUser = data.readInt() == 1;
+            int resizeMode = data.readInt();
             Rect r = Rect.CREATOR.createFromParcel(data);
-            resizeTask(taskId, r, resizedByUser);
+            resizeTask(taskId, r, resizeMode);
             reply.writeNoException();
             return true;
         }
@@ -5900,13 +5900,13 @@
     }
 
     @Override
-    public void resizeTask(int taskId, Rect r, boolean resizedByUser) throws RemoteException
+    public void resizeTask(int taskId, Rect r, int resizeMode) throws RemoteException
     {
         Parcel data = Parcel.obtain();
         Parcel reply = Parcel.obtain();
         data.writeInterfaceToken(IActivityManager.descriptor);
         data.writeInt(taskId);
-        data.writeInt(resizedByUser ? 1 : 0);
+        data.writeInt(resizeMode);
         r.writeToParcel(data, 0);
         mRemote.transact(RESIZE_TASK_TRANSACTION, data, reply, 0);
         reply.readException();

core/java/android/app/IActivityManager.java

diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index 7bd832b..2180bcc 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -491,7 +491,7 @@
     public void setTaskDescription(IBinder token, ActivityManager.TaskDescription values)
             throws RemoteException;
     public void setTaskResizeable(int taskId, boolean resizeable) throws RemoteException;
-    public void resizeTask(int taskId, Rect bounds, boolean resizedByUser) throws RemoteException;
+    public void resizeTask(int taskId, Rect bounds, int resizeMode) throws RemoteException;
 
     public Rect getTaskBounds(int taskId) throws RemoteException;
     public Bitmap getTaskDescriptionIcon(String filename) throws RemoteException;