diff options
author | Adam Cohen <adamcohen@google.com> | 2013-09-22 12:09:32 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-09-22 17:41:40 -0700 |
commit | 410f3cdfb4a8c2cf82749a3e73201fb7930540ae (patch) | |
tree | 76cce025d072353d887c499b17a09b4f13b48eda /src/com/android/launcher3/PagedView.java | |
parent | e67ccac004416d78d37968f60fe68f3bac6d33c1 (diff) | |
download | android_packages_apps_Trebuchet-410f3cdfb4a8c2cf82749a3e73201fb7930540ae.tar.gz android_packages_apps_Trebuchet-410f3cdfb4a8c2cf82749a3e73201fb7930540ae.tar.bz2 android_packages_apps_Trebuchet-410f3cdfb4a8c2cf82749a3e73201fb7930540ae.zip |
Getting the Overview Mode to look up to spec
-> New assets, text, fonts
-> New spacing of pages (translated upwards)
-> Updated outline color to white (the ones we're drawing)
Change-Id: Ie664ac0598ae18b86ae6d54d1d6b497c13d2ee95
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 763dfa1a9..31a979760 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -111,6 +111,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc protected float mTouchX; protected boolean mFirstLayout = true; + private int mNormalChildHeight; protected int mCurrentPage; protected int mRestorePage = -1; @@ -722,6 +723,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc super.addView(page, 0, lp); } + public int getNormalChildHeight() { + return mNormalChildHeight; + } + @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { if (!mIsDataReady || getChildCount() == 0) { @@ -739,6 +744,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // viewport, we can be at most one and a half screens offset once we scale down DisplayMetrics dm = getResources().getDisplayMetrics(); int maxSize = Math.max(dm.widthPixels, dm.heightPixels + mInsets.top + mInsets.bottom); + int parentWidthSize, parentHeightSize; int scaledWidthSize, scaledHeightSize; if (mUseMinScale) { @@ -804,6 +810,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc childWidth = widthSize - horizontalPadding; childHeight = heightSize - verticalPadding - mInsets.top - mInsets.bottom; + mNormalChildHeight = childHeight; } else { childWidthMode = MeasureSpec.EXACTLY; |