Handful of small changes / bug fixes
-> Fixed fade in of overview panel on first animation -> Fixed long press issue in page indicator region -> Added background scrim to overview mode -> Fading search bar in overview mode / disabling clickability of search bar and mic Change-Id: Ic9bf84f7cb9ff2991c5b4e93273d9e3f65556e5c
This commit is contained in:
@@ -133,6 +133,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
|
||||
protected float mTotalMotionX;
|
||||
private int mLastScreenCenter = -1;
|
||||
|
||||
private boolean mCancelTap;
|
||||
|
||||
private int[] mPageScrolls;
|
||||
|
||||
protected final static int TOUCH_STATE_REST = 0;
|
||||
@@ -735,7 +737,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
|
||||
// NOTE: We multiply by 1.5f to account for the fact that depending on the offset of the
|
||||
// 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);
|
||||
int maxSize = Math.max(dm.widthPixels, dm.heightPixels + mInsets.top + mInsets.bottom);
|
||||
int parentWidthSize, parentHeightSize;
|
||||
int scaledWidthSize, scaledHeightSize;
|
||||
if (mUseMinScale) {
|
||||
@@ -1851,7 +1853,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
|
||||
onDropToDelete();
|
||||
}
|
||||
} else {
|
||||
onUnhandledTap(ev);
|
||||
if (!mCancelTap) {
|
||||
onUnhandledTap(ev);
|
||||
}
|
||||
}
|
||||
|
||||
// Remove the callback to wait for the side page hover timeout
|
||||
@@ -1884,6 +1888,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
|
||||
private void resetTouchState() {
|
||||
releaseVelocityTracker();
|
||||
endReordering();
|
||||
mCancelTap = false;
|
||||
mTouchState = TOUCH_STATE_REST;
|
||||
mActivePointerId = INVALID_POINTER;
|
||||
}
|
||||
@@ -2156,6 +2161,12 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
|
||||
return mAllowLongPress;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean performLongClick() {
|
||||
mCancelTap = true;
|
||||
return super.performLongClick();
|
||||
}
|
||||
|
||||
/**
|
||||
* Set true to allow long-press events to be triggered, usually checked by
|
||||
* {@link Launcher} to accept or block dpad-initiated long-presses.
|
||||
|
||||
Reference in New Issue
Block a user