From 577d34207e3d9fcd676d093019bd85da631cef8b Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Mon, 15 Feb 2016 09:20:04 -0800
Subject: Trebuchet: Fix measuring error when reloading app drawer

Issue-id: CYNGNOS-1883

Change-Id: I77705be7020120bc58a45f507b288838a5eba2bb
---
 src/com/android/launcher3/Launcher.java                     |  2 +-
 src/com/android/launcher3/allapps/AllAppsContainerView.java | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index eaf56874c..64e8579ea 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1885,7 +1885,7 @@ public class Launcher extends Activity
         setupSearchBar(this);
         mAppsView.addApps(addedApps);
         tryAndUpdatePredictedApps();
-        mAppsView.reset();
+        mAppsView.onReloadAppDrawer();
         sRemoteFolderManager.onReloadAppDrawer();
     }
 
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index f9690f509..8e4491180 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -98,6 +98,8 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
     // This coordinate is relative to its parent
     private final Point mIconLastTouchPos = new Point();
 
+    private boolean mReloadDrawer = false;
+
     private View.OnClickListener mSearchClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -178,11 +180,13 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
     }
 
     /**
-     * Resets the existing apps in the list
+     * Reloads the existing apps in the list
      */
-    public void reset() {
+    public void onReloadAppDrawer() {
+        mReloadDrawer = true;
         List<AppInfo> apps = mApps.getApps();
         updateApps(apps);
+        requestLayout();
     }
 
     /**
@@ -378,6 +382,10 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
         }
 
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        if (mReloadDrawer) {
+            updateBackgroundAndPaddings(true);
+            mReloadDrawer = false;
+        }
     }
 
     /**
-- 
cgit v1.2.3