aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

am 4a0df755: Merge "Computing the visible cell layout area without using the current scroll" into ub-launcher3-burnaby

Browse Source 
* commit '4a0df755161c65e2d24299aeaf7408b2e97036d3':
  Computing the visible cell layout area without using the current scroll
This commit is contained in:
Sunny Goyal
2015-07-09 17:19:38 +00:00
committed by Android Git Automerger
parent 9e0fdb2869 4a0df75516
commit 6d5fd2aee8
2 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/com/android/launcher3/Workspace.java
View File

@@ -241,11 +241,6 @@ public class Workspace extends PagedView
private SparseArray<Parcelable> mSavedStates;
private final ArrayList<Integer> mRestoredPages = new ArrayList<Integer>();
// These variables are used for storing the initial and final values during workspace animations
private int mSavedScrollX;
private float mSavedRotationY;
private float mSavedTranslationX;
private float mCurrentScale;
private float mTransitionProgress;
@@ -2754,26 +2749,26 @@ public class Workspace extends PagedView
}
}
public void setFinalScrollForPageChange(int pageIndex) {
CellLayout cl = (CellLayout) getChildAt(pageIndex);
if (cl != null) {
mSavedScrollX = getScrollX();
mSavedTranslationX = cl.getTranslationX();
mSavedRotationY = cl.getRotationY();
final int newX = getScrollForPage(pageIndex);
setScrollX(newX);
cl.setTranslationX(0f);
cl.setRotationY(0f);
/**
* Computes the area relative to dragLayer which is used to display a page.
*/
public void getPageAreaRelativeToDragLayer(Rect outArea) {
CellLayout child = (CellLayout) getChildAt(getNextPage());
if (child == null) {
return;
}
}
ShortcutAndWidgetContainer boundingLayout = child.getShortcutsAndWidgets();
public void resetFinalScrollForPageChange(int pageIndex) {
if (pageIndex >= 0) {
CellLayout cl = (CellLayout) getChildAt(pageIndex);
setScrollX(mSavedScrollX);
cl.setTranslationX(mSavedTranslationX);
cl.setRotationY(mSavedRotationY);
}
// Use the absolute left instead of the child left, as we want the visible area
// irrespective of the visible child. Since the view can only scroll horizontally, the
// top position is not affected.
mTempXY[0] = getViewportOffsetX() + getPaddingLeft() + boundingLayout.getLeft();
mTempXY[1] = child.getTop() + boundingLayout.getTop();
float scale = mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(this, mTempXY);
outArea.set(mTempXY[0], mTempXY[1],
(int) (mTempXY[0] + scale * boundingLayout.getMeasuredWidth()),
(int) (mTempXY[1] + scale * boundingLayout.getMeasuredHeight()));
}
public void getViewLocationRelativeToSelf(View v, int[] location) {