SystemUI: improve qs tile layout mechanism

Previously we'd have a temp tile array which would hold tiles until we
were ready to do the first layout pass which caused some funky layouts
initially in specific cases. Get rid of the temp tile array and handle
setting tiles in one pass.

Ref: CYNGNOS-1601

Change-Id: Ibfa4994600c55ced80b8292cbefa9aa1f44971ae
Signed-off-by: Roman Birg <roman@cyngn.com>

1 files changed, 81 insertions, 121 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java
index c7b1f1d..f45378d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java
@@ -83,6 +83,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
 
     private static final String TAG = "QSDragPanel";
 
+    public static final boolean DEBUG_TILES = false;
     public static final boolean DEBUG_DRAG = false;
 
     private static final int MAX_ROW_COUNT = 3;
@@ -114,7 +115,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
 
     List<TileRecord> mCurrentlyAnimating
             = Collections.synchronizedList(new ArrayList<TileRecord>());
-    private Collection<QSTile<?>> mTempTiles = null;
 
     private Point mDisplaySize;
     private int[] mTmpLoc;
@@ -454,9 +454,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
 
     protected int getCurrentMaxPageCount() {
         int initialSize = mRecords.size();
-        if (mTempTiles != null) {
-            return getPagesForCount(initialSize + mTempTiles.size());
-        }
         return getPagesForCount(initialSize);
     }
 
@@ -498,102 +495,100 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
 
     public void setTiles(final Collection<QSTile<?>> tilesCollection) {
         final List<QSTile<?>> tiles = new ArrayList<>(tilesCollection);
-        if (isLaidOut()) {
-            if (DEBUG_DRAG) {
-                Log.i(TAG, "setTiles() called with " + "tiles = ["
-                        + tiles + "], mTempTiles: " + mTempTiles);
-                if (mTempTiles != null) {
-                    Log.e(TAG, "temp tiles being overridden... : " +
-                            Arrays.toString(mTempTiles.toArray()));
-                }
-            }
-
-            if (mLastDragRecord != null && mRecords.indexOf(mLastDragRecord) == -1) {
-                // the last removed record might be stored in mLastDragRecord if we just shifted
-                // re-add it to the list so we'll clean it up below
-                mRecords.add(mLastDragRecord);
-                mLastDragRecord = null;
-            }
+        if (DEBUG_TILES) {
+            Log.i(TAG, "setTiles() called with " + "tiles = ["
+                    + tiles + "]");
+        }
 
-            Map<QSTile<?>, DragTileRecord> recordMap = new ArrayMap<>();
-            Iterator<TileRecord> iterator = mRecords.iterator();
+        if (mLastDragRecord != null && mRecords.indexOf(mLastDragRecord) == -1) {
+            // the last removed record might be stored in mLastDragRecord if we just shifted
+            // re-add it to the list so we'll clean it up below
+            mRecords.add(mLastDragRecord);
+            mLastDragRecord = null;
+        }
 
-            int recordsRemoved = 0;
-            // cleanup current records
-            while (iterator.hasNext()) {
-                DragTileRecord dr = (DragTileRecord) iterator.next();
+        Map<QSTile<?>, DragTileRecord> recordMap = new ArrayMap<>();
+        Iterator<TileRecord> iterator = mRecords.iterator();
 
-                if (tiles.contains(dr.tile)) {
-                    if (DEBUG_DRAG) {
-                        Log.i(TAG, "caching tile: " + dr.tile);
-                    }
-                    recordMap.put(dr.tile, dr);
-                } else {
-                    if (DEBUG_DRAG) {
-                        Log.i(TAG, "removing tile: " + dr.tile);
-                    }
-                    // clean up view
-                    mPages.get(dr.page).removeView(dr.tileView);
+        int recordsRemoved = 0;
+        // cleanup current records
+        while (iterator.hasNext()) {
+            DragTileRecord dr = (DragTileRecord) iterator.next();
 
-                    // remove record
-                    iterator.remove();
-                    recordsRemoved++;
+            if (tiles.contains(dr.tile)) {
+                if (DEBUG_TILES) {
+                    Log.i(TAG, "caching tile: " + dr.tile);
+                }
+                recordMap.put(dr.tile, dr);
+            } else {
+                if (DEBUG_TILES) {
+                    Log.i(TAG, "removing tile: " + dr.tile);
                 }
+                // clean up view
+                mPages.get(dr.page).removeView(dr.tileView);
+
+                // remove record
+                iterator.remove();
+                recordsRemoved++;
             }
+        }
 
 
-            // at this point recordMap should have all retained tiles, no new or old tiles
-            int delta = tiles.size() - recordMap.size() - recordsRemoved;
-            if (DEBUG_DRAG) {
-                Log.i(TAG, "record map delta: " + delta);
-            }
-            mRecords.ensureCapacity(tiles.size());
-            mPagerAdapter.notifyDataSetChanged();
+        // at this point recordMap should have all retained tiles, no new or old tiles
+        int delta = tiles.size() - recordMap.size() - recordsRemoved;
+        if (DEBUG_TILES) {
+            Log.i(TAG, "record map delta: " + delta);
+        }
+        mRecords.ensureCapacity(tiles.size());
+        mPagerAdapter.notifyDataSetChanged();
 
-            // add new tiles
-            for (int i = 0; i < tiles.size(); i++) {
-                QSTile<?> tile = tiles.get(i);
-                final int tileDestPage = getPagesForCount(i + 1) - 1;
+        // add new tiles
+        for (int i = 0; i < tiles.size(); i++) {
+            QSTile<?> tile = tiles.get(i);
+            final int tileDestPage = getPagesForCount(i + 1) - 1;
 
-                if (DEBUG_DRAG) {
-                    Log.d(TAG, "tile at : " + i + ": " + tile + " to dest page: " + tileDestPage);
+            if (DEBUG_TILES) {
+                Log.d(TAG, "tile at : " + i + ": " + tile + " to dest page: " + tileDestPage);
+            }
+            DragTileRecord record;
+            if (!recordMap.containsKey(tile)) {
+                if (DEBUG_TILES) {
+                    Log.d(TAG, "tile at: " + i + " not cached, adding it to records");
                 }
-                if (!recordMap.containsKey(tile)) {
-                    DragTileRecord record = makeRecord(tile);
-                    record.destinationPage = tileDestPage;
-                    recordMap.put(tile, record);
-                    mRecords.add(i, record);
-                    mPagerAdapter.notifyDataSetChanged();
-
-                    // add the view
-                    mPages.get(record.destinationPage).addView(record.tileView);
-                    record.page = record.destinationPage;
-                    if (DEBUG_DRAG) {
-                        Log.d(TAG, "added new record " + record);
+                record = makeRecord(tile);
+                record.destinationPage = tileDestPage;
+                recordMap.put(tile, record);
+                mRecords.add(i, record);
+                mPagerAdapter.notifyDataSetChanged();
+            } else {
+                record = recordMap.get(tile);
+                if (DEBUG_TILES) {
+                    Log.d(TAG, "tile at : " + i + ": cached, restoring: " + record);
+                }
+                int indexOf = mRecords.indexOf(record);
+                if (indexOf != i) {
+                    if (DEBUG_TILES) {
+                        Log.w(TAG, "moving index of " + record + " from "
+                                + indexOf + " to " + i);
                     }
-                } else {
-                    DragTileRecord record = recordMap.get(tile);
-                    int indexOf = mRecords.indexOf(record);
-                    if (indexOf != i) {
-                        if (DEBUG_DRAG) {
-                            Log.w(TAG, "moving index of " + record + " from "
-                                    + indexOf + " to " + i);
-                        }
-                        Collections.swap(mRecords, indexOf, i);
+                    Collections.swap(mRecords, indexOf, i);
 
-                        record.destinationPage = tileDestPage;
-                        ensureDestinationPage(record);
-                    }
+                    record.destinationPage = tileDestPage;
+                    ensureDestinationPage(record);
                 }
+
             }
-            if (isShowingDetail()) {
-                mDetail.bringToFront();
-            }
-        } else if (!isLaidOut()) {
-            if (DEBUG_DRAG) {
-                Log.w(TAG, "setting temporary tiles to layout");
+            if (record.page == -1) {
+                // add the view
+                mPages.get(record.destinationPage).addView(record.tileView);
+                record.page = record.destinationPage;
+                if (DEBUG_TILES) {
+                    Log.d(TAG, "added view " + record);
+                }
             }
-            mTempTiles = Collections.synchronizedCollection(new ArrayList<QSTile<?>>(tiles));
+        }
+        if (isShowingDetail()) {
+            mDetail.bringToFront();
         }
         mPagerAdapter.notifyDataSetChanged();
 
@@ -612,7 +607,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
     }
 
     private DragTileRecord makeRecord(final QSTile<?> tile) {
-        if (DEBUG_DRAG) {
+        if (DEBUG_TILES) {
             Log.d(TAG, "+++ makeRecord() called with " + "tile = [" + tile + "]");
         }
         final DragTileRecord r = new DragTileRecord();
@@ -689,37 +684,12 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         r.tileView.setVisibility(mEditing ? View.VISIBLE : View.GONE);
         callback.onStateChanged(r.tile.getState());
 
-        if (DEBUG_DRAG) {
+        if (DEBUG_TILES) {
             Log.d(TAG, "--- makeRecord() called with " + "tile = [" + tile + "]");
         }
         return r;
     }
 
-    private void addTile(final QSTile<?> tile) {
-        if (DEBUG_DRAG) {
-            Log.d(TAG, "+++ addTile() called with " + "tile = [" + tile + "]");
-        }
-        DragTileRecord r = makeRecord(tile);
-        mRecords.add(r);
-        mPagerAdapter.notifyDataSetChanged();
-
-        r.destinationPage = getPagesForCount(mRecords.size()) - 1;
-
-        if (DEBUG_DRAG) {
-            Log.d(TAG, "destinationPage: " + r.destinationPage);
-        }
-
-        mPages.get(r.destinationPage).addView(r.tileView);
-        r.page = r.destinationPage;
-        drawTile(r, r.tile.getState());
-
-        ensurePagerState();
-
-        if (DEBUG_DRAG) {
-            Log.d(TAG, "--- addTile() called with " + "tile = [" + tile + "]");
-        }
-    }
-
     public void ensurePagerState() {
         if (!isShowingDetail()) {
             final boolean pagingEnabled = getVisibleTilePageCount() > 1 || mDragging || mEditing;
@@ -841,16 +811,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                     footer.getMeasuredWidth(), getMeasuredHeight());
         }
 
-        if (mTempTiles != null) {
-            final Iterator<QSTile<?>> iterator = mTempTiles.iterator();
-            while (iterator.hasNext()) {
-                addTile(iterator.next());
-                iterator.remove();
-            }
-            mTempTiles = null;
-            mPagerAdapter.notifyDataSetChanged();
-            requestLayout();
-        }
         ensurePagerState();
     }