Merge "Remove prolonged animations" into pi-dev
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 8395681..131fe13 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -128,7 +128,10 @@
void overridePendingAppTransitionRemote(in RemoteAnimationAdapter remoteAnimationAdapter);
void executeAppTransition();
- /** Used by system ui to report that recents has shown itself. */
+ /**
+ * Used by system ui to report that recents has shown itself.
+ * @deprecated to be removed once prebuilts are updated
+ */
void endProlongedAnimations();
// Re-evaluate the current orientation from the caller's state.
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java
index 9355acf..68e3b92 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java
@@ -104,14 +104,6 @@
}
}
- public void endProlongedAnimations() {
- try {
- WindowManagerGlobal.getWindowManagerService().endProlongedAnimations();
- } catch (RemoteException e) {
- Log.w(TAG, "Failed to end prolonged animations: ", e);
- }
- }
-
/**
* Enable or disable haptic feedback on the navigation bar buttons.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
index 95b311f..36a1255 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
@@ -835,9 +835,6 @@
@Override
public boolean onPreDraw() {
mRecentsView.getViewTreeObserver().removeOnPreDrawListener(this);
- // We post to make sure that this information is delivered after this traversals is
- // finished.
- mRecentsView.post(() -> WindowManagerWrapper.getInstance().endProlongedAnimations());
return true;
}
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index 0dc06b2..762d4e5 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -245,7 +245,6 @@
private int mLastClipRevealMaxTranslation;
private boolean mLastHadClipReveal;
- private boolean mProlongedAnimationsEnded;
private final boolean mGridLayoutRecentsEnabled;
private final boolean mLowRamRecentsEnabled;
@@ -423,27 +422,12 @@
mService.getDefaultDisplayContentLocked().getDockedDividerController()
.notifyAppTransitionStarting(openingApps, transit);
- // Prolong the start for the transition when docking a task from recents, unless recents
- // ended it already then we don't need to wait.
- if (transit == TRANSIT_DOCK_TASK_FROM_RECENTS && !mProlongedAnimationsEnded) {
- for (int i = openingApps.size() - 1; i >= 0; i--) {
- final AppWindowToken app = openingApps.valueAt(i);
- app.startDelayingAnimationStart();
- }
- }
if (mRemoteAnimationController != null) {
mRemoteAnimationController.goodToGo();
}
return redoLayout;
}
- /**
- * Let the transitions manager know that the somebody wanted to end the prolonged animations.
- */
- void notifyProlongedAnimationsEnded() {
- mProlongedAnimationsEnded = true;
- }
-
void clear() {
mNextAppTransitionType = NEXT_TRANSIT_TYPE_NONE;
mNextAppTransitionPackage = null;
@@ -452,7 +436,6 @@
mNextAppTransitionAnimationsSpecsFuture = null;
mDefaultNextAppTransitionAnimationSpec = null;
mAnimationFinishedCallback = null;
- mProlongedAnimationsEnded = false;
}
void freeze() {
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 09e43f8..44bd8cd 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -2677,15 +2677,7 @@
@Override
public void endProlongedAnimations() {
- synchronized (mWindowMap) {
- for (final WindowState win : mWindowMap.values()) {
- final AppWindowToken appToken = win.mAppToken;
- if (appToken != null) {
- appToken.endDelayingAnimationStart();
- }
- }
- mAppTransition.notifyProlongedAnimationsEnded();
- }
+ // TODO: Remove once clients are updated.
}
@Override