commit 1f325ab01e6c2103f48b3225ef5a3df8aded8215
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 17 18:15:39 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 17 18:15:39 2020 +0000
tree f4036bc71f1cef2651f86398bd5974f05b0c3252
parent 349194569f80e241a6bfe64565d13be8a3b4df79
parent 9459f3101fdf6f43c8998eea03a71df1a7434d13

Merge "Don't reset RecentsView in onIdpChanged()" into ub-launcher3-rvc-dev

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index bdfc15c..7d25447 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -488,7 +488,8 @@
             return;
         }
         mModel.getIconCache().clear();
-        reset();
+        unloadVisibleTaskData();
+        loadVisibleTaskData();
     }
 
     public void init(OverviewActionsView actionsView) {

src/com/android/launcher3/InvariantDeviceProfile.java

diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 60abc66..e39e89c 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -148,6 +148,7 @@
         iconSize = p.iconSize;
         iconShapePath = p.iconShapePath;
         landscapeIconSize = p.landscapeIconSize;
+        iconBitmapSize = p.iconBitmapSize;
         iconTextSize = p.iconTextSize;
         numHotseatIcons = p.numHotseatIcons;
         numAllAppsColumns = p.numAllAppsColumns;