commit 69ed200530058afceedad1abe6c15da3b0c61909
author Adam Cohen <adamcohen@google.com> Wed Aug 27 21:27:01 2014 -0700
committer Adam Cohen <adamcohen@google.com> Thu Aug 28 10:10:13 2014 -0700
tree 17ace65519f05b1c0dc771b6708fc72fafac4818
parent 74dc410bd19e07cde8702ad9c33dc1c25332d664

Fix regression which was causing requestLayout in layout pass

-> This caused funky layout issues with views not appearing
   on devices prior to K in addition to log spam.

issue 17282728

Change-Id: Id05856ba2ef3de3a8a636ba9b4b46ddef3eff75e

src/com/android/launcher3/AppsCustomizeCellLayout.java

diff --git a/src/com/android/launcher3/AppsCustomizeCellLayout.java b/src/com/android/launcher3/AppsCustomizeCellLayout.java
index 76b81d2..a50fb68 100644
--- a/src/com/android/launcher3/AppsCustomizeCellLayout.java
+++ b/src/com/android/launcher3/AppsCustomizeCellLayout.java
@@ -68,4 +68,4 @@
             children.getChildAt(j).setOnKeyListener(null);
         }
     }
-}
\ No newline at end of file
+}

src/com/android/launcher3/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 03e1e56..558d8e9 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -362,8 +362,14 @@
 
         if (!isDataReady()) {
             if ((LauncherAppState.isDisableAllApps() || !mApps.isEmpty()) && !mWidgets.isEmpty()) {
-                setDataIsReady();
-                onDataReady(getMeasuredWidth(), getMeasuredHeight());
+                post(new Runnable() {
+                    // This code triggers requestLayout so must be posted outside of the
+                    // layout pass.
+                    public void run() {
+                        setDataIsReady();
+                        onDataReady(getMeasuredWidth(), getMeasuredHeight());
+                    }
+                });
             }
         }
     }

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 54aa24e..0434faf 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -996,9 +996,7 @@
         }
 
         if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < getChildCount()) {
-            setHorizontalScrollBarEnabled(false);
             updateCurrentPageScroll();
-            setHorizontalScrollBarEnabled(true);
             mFirstLayout = false;
         }