diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-10-16 20:53:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-16 20:53:04 +0000 |
| commit | 51b9f6a5707047f9fe67e25256deecc9348dd35a (patch) | |
| tree | f6a44a57bea79b6a68f982c45b6a7f54543af20d /src | |
| parent | 5801ef048adea9ca1a2e31839b73655d3d258b21 (diff) | |
| parent | 8fd3adc2a3ca4c2cbf6af4917d2c3addc0a7e678 (diff) | |
| download | android_packages_apps_Trebuchet-51b9f6a5707047f9fe67e25256deecc9348dd35a.tar.gz android_packages_apps_Trebuchet-51b9f6a5707047f9fe67e25256deecc9348dd35a.tar.bz2 android_packages_apps_Trebuchet-51b9f6a5707047f9fe67e25256deecc9348dd35a.zip | |
Merge "Refactor RTL wallpaper code to use getLayoutTransitionOffsetForPage" into jb-ub-now-jetsonic
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 8 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index e982985f1..e724063df 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -268,8 +268,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc protected final Rect mInsets = new Rect(); - protected int mFirstChildLeft; - public interface PageSwitchListener { void onPageSwitch(View newPage, int newPageIndex); } @@ -899,10 +897,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc requestLayout(); } - protected int getFirstChildLeft() { - return mFirstChildLeft; - } - @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { if (!mIsDataReady || getChildCount() == 0) { @@ -928,7 +922,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc int verticalPadding = getPaddingTop() + getPaddingBottom(); - int childLeft = mFirstChildLeft = offsetX + (screenWidth - getChildWidth(startIndex)) / 2; + int childLeft = offsetX + (screenWidth - getChildWidth(startIndex)) / 2; if (mPageScrolls == null || getChildCount() != mChildCountOnLastLayout) { mPageScrolls = new int[getChildCount()]; } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index d2d1254ed..2fdcb436a 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1199,10 +1199,8 @@ public class Workspace extends SmoothPagedView // TODO: do different behavior if it's a live wallpaper? // Sometimes the left parameter of the pages is animated during a layout transition; // this parameter offsets it to keep the wallpaper from animating as well - int offsetForLayoutTransitionAnimation = isLayoutRtl() ? - getPageAt(getChildCount() - 1).getLeft() - getFirstChildLeft() : 0; int adjustedScroll = - getScrollX() - firstPageScrollX - offsetForLayoutTransitionAnimation; + getScrollX() - firstPageScrollX - getLayoutTransitionOffsetForPage(0); float offset = Math.min(1, adjustedScroll / (float) scrollRange); offset = Math.max(0, offset); // Don't use up all the wallpaper parallax until you have at least |