Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-dev
This commit is contained in:
@ -326,7 +326,6 @@ class AppWidgetServiceImpl {
|
||||
pw.print(" resizeMode=");
|
||||
pw.print(info.resizeMode);
|
||||
pw.print(info.widgetCategory);
|
||||
pw.print(info.widgetFeatures);
|
||||
pw.print(" autoAdvanceViewId=");
|
||||
pw.print(info.autoAdvanceViewId);
|
||||
pw.print(" initialLayout=#");
|
||||
@ -1412,9 +1411,6 @@ class AppWidgetServiceImpl {
|
||||
info.widgetCategory = sa.getInt(
|
||||
com.android.internal.R.styleable.AppWidgetProviderInfo_widgetCategory,
|
||||
AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);
|
||||
info.widgetFeatures = sa.getInt(
|
||||
com.android.internal.R.styleable.AppWidgetProviderInfo_widgetFeatures,
|
||||
AppWidgetProviderInfo.WIDGET_FEATURES_NONE);
|
||||
|
||||
sa.recycle();
|
||||
} catch (Exception e) {
|
||||
|
@ -584,6 +584,7 @@ class TouchExplorer implements EventStreamTransformation {
|
||||
// a given distance perform a drag.
|
||||
mCurrentState = STATE_DRAGGING;
|
||||
mDraggingPointerId = pointerId;
|
||||
event.setEdgeFlags(receivedTracker.getLastReceivedDownEdgeFlags());
|
||||
sendMotionEvent(event, MotionEvent.ACTION_DOWN, pointerIdBits,
|
||||
policyFlags);
|
||||
} else {
|
||||
@ -1752,6 +1753,9 @@ class TouchExplorer implements EventStreamTransformation {
|
||||
// Which pointers are down.
|
||||
private int mReceivedPointersDown;
|
||||
|
||||
// The edge flags of the last received down event.
|
||||
private int mLastReceivedDownEdgeFlags;
|
||||
|
||||
// Which down pointers are active.
|
||||
private int mActivePointers;
|
||||
|
||||
@ -1946,6 +1950,13 @@ class TouchExplorer implements EventStreamTransformation {
|
||||
return mLastReceivedUpPointerDownY;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The edge flags of the last received down event.
|
||||
*/
|
||||
public int getLastReceivedDownEdgeFlags() {
|
||||
return mLastReceivedDownEdgeFlags;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether the last received pointer that went up was active.
|
||||
*/
|
||||
@ -1995,6 +2006,8 @@ class TouchExplorer implements EventStreamTransformation {
|
||||
mLastReceivedUpPointerDownX = 0;
|
||||
mLastReceivedUpPointerDownX = 0;
|
||||
|
||||
mLastReceivedDownEdgeFlags = event.getEdgeFlags();
|
||||
|
||||
mReceivedPointersDown |= pointerFlag;
|
||||
mReceivedPointerDownX[pointerId] = event.getX(pointerIndex);
|
||||
mReceivedPointerDownY[pointerId] = event.getY(pointerIndex);
|
||||
|
Reference in New Issue
Block a user