Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf29e8a8 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am 67ef1c40: Merge "Fix regression which was causing requestLayout in layout... 

am 67ef1c40: Merge "Fix regression which was causing requestLayout in layout pass" into ub-now-porkchop

* commit '67ef1c40':
  Fix regression which was causing requestLayout in layout pass
parents f4365b5c 67ef1c40

src/com/android/launcher3/AppsCustomizePagedView.java

+8 −2
Original line number Diff line number Diff line
@@ -362,9 +362,15 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen 


        if (!isDataReady()) {

            if ((LauncherAppState.isDisableAllApps() || !mApps.isEmpty()) && !mWidgets.isEmpty()) {

                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

+0 −2
Original line number Diff line number Diff line
@@ -996,9 +996,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
        }



        if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < getChildCount()) {

            setHorizontalScrollBarEnabled(false);

            updateCurrentPageScroll();

            setHorizontalScrollBarEnabled(true);

            mFirstLayout = false;

        }

src/com/android/launcher3/AppsCustomizeCellLayout.java

+1 −1

File changed.

Contains only whitespace changes.