diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-07-21 17:44:06 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2014-08-10 18:29:36 -0700 |
| commit | 9bfdb76aaf5c8679b8f2ee3a9a3df2becefb947a (patch) | |
| tree | f7a8c90e206701c2129eb5c7ed4956c265478329 /src/com/android/launcher3/PagedView.java | |
| parent | 6075170b838bfe7a040bbff25c2c22859b7d6ee5 (diff) | |
| download | android_packages_apps_Trebuchet-9bfdb76aaf5c8679b8f2ee3a9a3df2becefb947a.tar.gz android_packages_apps_Trebuchet-9bfdb76aaf5c8679b8f2ee3a9a3df2becefb947a.tar.bz2 android_packages_apps_Trebuchet-9bfdb76aaf5c8679b8f2ee3a9a3df2becefb947a.zip | |
Polishing the AllApps transition
-> separating HW layers during animation to be siblings
instead of parent-child (was destroying parent layer
on each frame)
-> Unifying material transition with pre-L, everything
is the same, just missing the reveal.
Change-Id: I8f7d5e658c2d9298bea83ce8199cb35e6fc0d44e
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 1037d9809..4e34628da 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -339,8 +339,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // Hook up the page indicator ViewGroup parent = (ViewGroup) getParent(); + ViewGroup grandParent = (ViewGroup) parent.getParent(); if (mPageIndicator == null && mPageIndicatorViewId > -1) { - mPageIndicator = (PageIndicator) parent.findViewById(mPageIndicatorViewId); + mPageIndicator = (PageIndicator) grandParent.findViewById(mPageIndicatorViewId); mPageIndicator.removeAllMarkers(mAllowPagedViewAnimations); ArrayList<PageIndicator.PageMarkerResources> markers = |