Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Force pinned windows to always be scaleable." into nyc-dev am: e67960e am: 6ce373a" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-04-22 19:24:48 +00:00
committed by Android (Google) Code Review
parent b1f36f2a76 2b115e9ba8
commit 69a89816f9
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ActivityManager.java
View File

@@ -694,6 +694,14 @@ public class ActivityManager {
public static boolean activitiesCanRequestVisibleBehind(int stackId) {
return stackId == FULLSCREEN_WORKSPACE_STACK_ID;
}
/**
* Returns true if this stack may be scaled without resizing,
* and windows within may need to be configured as such.
*/
public static boolean windowsAreScaleable(int stackId) {
return stackId == PINNED_STACK_ID;
}
}
/**

34
services/core/java/com/android/server/wm/TaskStack.java
View File

@@ -554,6 +554,15 @@ public class TaskStack implements DimLayer.DimLayerUser,
if (toTop) {
mDisplayContent.moveStack(this, true);
}
if (StackId.windowsAreScaleable(mStackId)) {
// We force windows out of SCALING_MODE_FREEZE
// so that we can continue to animate them
// while a resize is pending.
forceWindowsScaleable(task, true);
} else {
forceWindowsScaleable(task, false);
}
EventLog.writeEvent(EventLogTags.WM_TASK_MOVED, task.mTaskId, toTop ? 1 : 0, position);
}
@@ -1279,20 +1288,18 @@ public class TaskStack implements DimLayer.DimLayerUser,
return true;
}
void forceWindowsScaleable(boolean force) {
void forceWindowsScaleable(Task task, boolean force) {
SurfaceControl.openTransaction();
try {
for (int taskNdx = mTasks.size() - 1; taskNdx >= 0; --taskNdx) {
final ArrayList<AppWindowToken> activities = mTasks.get(taskNdx).mAppTokens;
for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {
final ArrayList<WindowState> windows = activities.get(activityNdx).allAppWindows;
for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
final WindowStateAnimator winAnimator = windows.get(winNdx).mWinAnimator;
if (winAnimator == null || !winAnimator.hasSurface()) {
continue;
}
winAnimator.mSurfaceController.forceScaleableInTransaction(force);
final ArrayList<AppWindowToken> activities = task.mAppTokens;
for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {
final ArrayList<WindowState> windows = activities.get(activityNdx).allAppWindows;
for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
final WindowStateAnimator winAnimator = windows.get(winNdx).mWinAnimator;
if (winAnimator == null || !winAnimator.hasSurface()) {
continue;
}
winAnimator.mSurfaceController.forceScaleableInTransaction(force);
}
}
} finally {
@@ -1303,10 +1310,6 @@ public class TaskStack implements DimLayer.DimLayerUser,
@Override // AnimatesBounds
public void onAnimationStart() {
synchronized (mService.mWindowMap) {
// We force windows out of SCALING_MODE_FREEZE
// so that we can continue to animate them
// while a resize is pending.
forceWindowsScaleable(true);
mFreezeMovementAnimations = true;
mBoundsAnimating = true;
}
@@ -1317,7 +1320,6 @@ public class TaskStack implements DimLayer.DimLayerUser,
synchronized (mService.mWindowMap) {
mFreezeMovementAnimations = false;
mBoundsAnimating = false;
forceWindowsScaleable(false);
mService.requestTraversal();
}
if (mStackId == PINNED_STACK_ID) {

6
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -17,6 +17,7 @@
package com.android.server.wm;
import static android.app.ActivityManager.StackId;
import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
import static android.view.WindowManager.LayoutParams.FLAG_SCALED;
@@ -1695,6 +1696,11 @@ class WindowStateAnimator {
* @return Returns true if the surface was successfully shown.
*/
private boolean showSurfaceRobustlyLocked() {
final Task task = mWin.getTask();
if (task != null && StackId.windowsAreScaleable(task.mStack.mStackId)) {
mSurfaceController.forceScaleableInTransaction(true);
}
boolean shown = mSurfaceController.showRobustlyInTransaction();
if (!shown)
return false;