Commit 9949c2f

committed

pull code

1 parent f99d544 commit 9949c2fCopy full SHA for 9949c2f

File tree

+16

-2

lines changed

Drag-FlowLayout/dragflowlayout/src/main
- java/com/heaven7/android/dragflowlayout
  - DragFlowLayout.java
- res/values
  - attr.xml

+16

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import android.annotation.TargetApi;`
`4`	`4`	`import android.content.Context;`
	`5`	`+import android.os.Parcelable;`
`5`	`6`	`import android.support.annotation.IntDef;`
`6`	`7`	`import android.support.annotation.NonNull;`
`7`	`8`	`import android.support.v4.view.GestureDetectorCompat;`
`@@ -526,7 +527,12 @@ protected void onDetachedFromWindow() {`
`526`	`527`	`removeCallbacks(mCheckForRelease);`
`527`	`528`	`}`
`528`	`529`
`529`		`- /* @Override`
	`530`	`+ @Override`
	`531`	`+ protected Parcelable onSaveInstanceState() {`
	`532`	`+ return super.onSaveInstanceState();`
	`533`	`+ }`
	`534`	`+`
	`535`	`+ /* @Override`
`530`	`536`	`public boolean onInterceptTouchEvent(MotionEvent ev) {`
`531`	`537`	`if(!mDraggable){`
`532`	`538`	`return super.onInterceptTouchEvent(ev);`
`@@ -924,5 +930,4 @@ public void updateItem(Object preData, Object newData) {`
`924`	`930`	`}`
`925`	`931`	`}`
`926`	`932`
`927`		`-`
`928`	`933`	`}`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,9 @@`
	`1`	`+<?xml version="1.0" encoding="utf-8"?>`
	`2`	`+`
	`3`	`+<resources>`
	`4`	`+ <declare-styleable name="FlowLayout">`
	`5`	`+ <attr name="fl_horizontal_space" format="dimension\|reference"/>`
	`6`	`+ <attr name="fl_vertical_space" format="dimension\|reference"/>`
	`7`	`+ </declare-styleable>`
	`8`	`+`
	`9`	`+</resources>`

Comments

(0)