commit 926f3839d81e4b6b60238e38350bec7cb6d0269e
author Craig Mautner <cmautner@google.com> Wed Feb 13 11:56:07 2013 -0800
committer Craig Mautner <cmautner@google.com> Wed Feb 13 11:58:56 2013 -0800
tree d7a0d58f767317e626e5b72d7db3145ef2f58680
parent 68b600913b699da0fbfcd9d913e4c4fdb08e06b8

Stop using AppToken movement and start using Task.

Change-Id: I5fbd3b2b692e0e127386051f782b1015515ba384

services/java/com/android/server/wm/DisplayContent.java

diff --git a/services/java/com/android/server/wm/DisplayContent.java b/services/java/com/android/server/wm/DisplayContent.java
index a592893..f8e779d 100644
--- a/services/java/com/android/server/wm/DisplayContent.java
+++ b/services/java/com/android/server/wm/DisplayContent.java
@@ -179,7 +179,10 @@
 
     void refillAnimatingAppTokens() {
         mAnimatingAppTokens.clear();
-        mAnimatingAppTokens.addAll(mAppTokens);
+        AppTokenIterator iterator = new AppTokenIterator();
+        while (iterator.hasNext()) {
+            mAnimatingAppTokens.add(iterator.next());
+        }
     }
 
     void setAppTaskId(AppWindowToken wtoken, int newTaskId) {
@@ -352,13 +355,16 @@
             pw.print("x"); pw.print(mDisplayInfo.smallestNominalAppHeight);
             pw.print("-"); pw.print(mDisplayInfo.largestNominalAppWidth);
             pw.print("x"); pw.println(mDisplayInfo.largestNominalAppHeight);
-            if (mAppTokens.size() > 0) {
+            AppTokenIterator iterator = new AppTokenIterator(true);
+            int ndx = iterator.size() - 1;
+            if (ndx >= 0) {
                 pw.println();
                 pw.println("  Application tokens in Z order:");
-                for (int i=mAppTokens.size()-1; i>=0; i--) {
-                    pw.print("  App #"); pw.print(i);
-                            pw.print(' '); pw.print(mAppTokens.get(i)); pw.println(":");
-                    mAppTokens.get(i).dump(pw, "    ");
+                while (iterator.hasNext()) {
+                    AppWindowToken wtoken = iterator.next();
+                    pw.print("  App #"); pw.print(ndx--);
+                            pw.print(' '); pw.print(wtoken); pw.println(":");
+                    wtoken.dump(pw, "    ");
                 }
             }
             if (mExitingTokens.size() > 0) {