Changes of com.discord v889

This commit is contained in:
root 2019-05-03 20:53:54 +02:00
parent 978663884f
commit dc8b0b8647
7005 changed files with 392258 additions and 379599 deletions

View file

@ -237,13 +237,13 @@
const/4 v1, 0x0
if-ne v0, p4, :cond_3
if-ne v0, p4, :cond_2
iget v0, p0, Landroidx/customview/widget/ViewDragHelper;->mTrackingEdges:I
and-int/2addr v0, p4
if-eqz v0, :cond_3
if-eqz v0, :cond_2
iget-object v0, p0, Landroidx/customview/widget/ViewDragHelper;->mEdgeDragsLocked:[I
@ -251,7 +251,7 @@
and-int/2addr v0, p4
if-eq v0, p4, :cond_3
if-eq v0, p4, :cond_2
iget-object v0, p0, Landroidx/customview/widget/ViewDragHelper;->mEdgeDragsInProgress:[I
@ -259,7 +259,7 @@
and-int/2addr v0, p4
if-eq v0, p4, :cond_3
if-eq v0, p4, :cond_2
iget v0, p0, Landroidx/customview/widget/ViewDragHelper;->mTouchSlop:I
@ -326,9 +326,6 @@
return p1
:cond_2
return v1
:cond_3
:goto_0
return v1
.end method
@ -423,7 +420,7 @@
return v0
:cond_6
if-eqz p1, :cond_8
if-eqz p1, :cond_7
invoke-static {p3}, Ljava/lang/Math;->abs(F)F
@ -441,9 +438,6 @@
:cond_7
return v0
:cond_8
return v0
.end method
.method private clampMag(FFF)F
@ -475,8 +469,6 @@
:cond_1
neg-float p1, p3
return p1
:cond_2
return p1
.end method
@ -504,8 +496,6 @@
:cond_1
neg-int p1, p3
return p1
:cond_2
return p1
.end method
@ -615,8 +605,6 @@
iput p1, p0, Landroidx/customview/widget/ViewDragHelper;->mPointersDown:I
return-void
:cond_1
:goto_0
return-void
@ -969,14 +957,9 @@
invoke-static {v2, v3}, Landroidx/core/view/ViewCompat;->offsetLeftAndRight(Landroid/view/View;I)V
move v6, p1
goto :goto_0
:cond_0
move v6, p1
:goto_0
if-eqz p4, :cond_1
iget-object p1, p0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
@ -993,14 +976,9 @@
invoke-static {p1, v2}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
move v7, p2
goto :goto_1
:cond_1
move v7, p2
:goto_1
if-nez p3, :cond_2
if-eqz p4, :cond_3
@ -1252,7 +1230,7 @@
.end method
.method private isValidPointerForActionMove(I)Z
.locals 3
.locals 2
invoke-virtual {p0, p1}, Landroidx/customview/widget/ViewDragHelper;->isPointerDown(I)Z
@ -1260,24 +1238,24 @@
if-nez v0, :cond_0
const-string v0, "ViewDragHelper"
new-instance v0, Ljava/lang/StringBuilder;
new-instance v1, Ljava/lang/StringBuilder;
const-string v1, "Ignoring pointerId="
const-string v2, "Ignoring pointerId="
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
const-string p1, " because ACTION_DOWN was not received for this pointer before ACTION_MOVE. It likely happened because ViewDragHelper did not receive all the events in the event stream."
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
move-result-object p1
const-string v0, "ViewDragHelper"
invoke-static {v0, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
const/4 p1, 0x0
@ -1904,7 +1882,7 @@
return v1
:cond_6
if-eqz p1, :cond_8
if-eqz p1, :cond_7
invoke-static {v4}, Ljava/lang/Math;->abs(F)F
@ -1922,9 +1900,6 @@
:cond_7
return v1
:cond_8
return v1
.end method
.method public continueSettling(Z)Z
@ -2418,25 +2393,42 @@
const/4 v2, 0x0
if-eqz v0, :cond_11
const/4 v3, 0x1
packed-switch v0, :pswitch_data_0
if-eq v0, v3, :cond_f
const/4 v4, 0x2
if-eq v0, v4, :cond_b
const/4 v4, 0x3
if-eq v0, v4, :cond_9
const/4 v4, 0x5
if-eq v0, v4, :cond_6
const/4 v4, 0x6
if-eq v0, v4, :cond_2
:pswitch_0
goto/16 :goto_3
:pswitch_1
:cond_2
invoke-virtual {p1, v1}, Landroid/view/MotionEvent;->getPointerId(I)I
move-result v0
iget v1, p0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
if-ne v1, v3, :cond_4
if-ne v1, v3, :cond_5
iget v1, p0, Landroidx/customview/widget/ViewDragHelper;->mActivePointerId:I
if-ne v0, v1, :cond_4
if-ne v0, v1, :cond_5
invoke-virtual {p1}, Landroid/view/MotionEvent;->getPointerCount()I
@ -2445,7 +2437,7 @@
:goto_0
const/4 v3, -0x1
if-ge v2, v1, :cond_3
if-ge v2, v1, :cond_4
invoke-virtual {p1, v2}, Landroid/view/MotionEvent;->getPointerId(I)I
@ -2453,7 +2445,7 @@
iget v5, p0, Landroidx/customview/widget/ViewDragHelper;->mActivePointerId:I
if-eq v4, v5, :cond_2
if-eq v4, v5, :cond_3
invoke-virtual {p1, v2}, Landroid/view/MotionEvent;->getX(I)F
@ -2473,37 +2465,37 @@
iget-object v6, p0, Landroidx/customview/widget/ViewDragHelper;->mCapturedView:Landroid/view/View;
if-ne v5, v6, :cond_2
if-ne v5, v6, :cond_3
invoke-virtual {p0, v6, v4}, Landroidx/customview/widget/ViewDragHelper;->tryCaptureViewForDrag(Landroid/view/View;I)Z
move-result v4
if-eqz v4, :cond_2
if-eqz v4, :cond_3
iget p1, p0, Landroidx/customview/widget/ViewDragHelper;->mActivePointerId:I
goto :goto_1
:cond_2
:cond_3
add-int/lit8 v2, v2, 0x1
goto :goto_0
:cond_3
:cond_4
const/4 p1, -0x1
:goto_1
if-ne p1, v3, :cond_4
if-ne p1, v3, :cond_5
invoke-direct {p0}, Landroidx/customview/widget/ViewDragHelper;->releaseViewForPointerUp()V
:cond_4
:cond_5
invoke-direct {p0, v0}, Landroidx/customview/widget/ViewDragHelper;->clearMotionHistory(I)V
return-void
:pswitch_2
:cond_6
invoke-virtual {p1, v1}, Landroid/view/MotionEvent;->getPointerId(I)I
move-result v0
@ -2520,7 +2512,7 @@
iget v1, p0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
if-nez v1, :cond_6
if-nez v1, :cond_8
float-to-int v1, v2
@ -2540,7 +2532,7 @@
and-int v2, p1, v1
if-eqz v2, :cond_5
if-eqz v2, :cond_7
iget-object v2, p0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
@ -2548,10 +2540,10 @@
invoke-virtual {v2, p1, v0}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
:cond_5
:cond_7
return-void
:cond_6
:cond_8
float-to-int v1, v2
float-to-int p1, p1
@ -2560,7 +2552,7 @@
move-result p1
if-eqz p1, :cond_c
if-eqz p1, :cond_12
iget-object p1, p0, Landroidx/customview/widget/ViewDragHelper;->mCapturedView:Landroid/view/View;
@ -2568,24 +2560,24 @@
return-void
:pswitch_3
:cond_9
iget p1, p0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
if-ne p1, v3, :cond_7
if-ne p1, v3, :cond_a
const/4 p1, 0x0
invoke-direct {p0, p1, p1}, Landroidx/customview/widget/ViewDragHelper;->dispatchViewReleased(FF)V
:cond_7
:cond_a
invoke-virtual {p0}, Landroidx/customview/widget/ViewDragHelper;->cancel()V
goto/16 :goto_3
:pswitch_4
:cond_b
iget v0, p0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
if-ne v0, v3, :cond_8
if-ne v0, v3, :cond_c
iget v0, p0, Landroidx/customview/widget/ViewDragHelper;->mActivePointerId:I
@ -2593,7 +2585,7 @@
move-result v0
if-eqz v0, :cond_c
if-eqz v0, :cond_12
iget v0, p0, Landroidx/customview/widget/ViewDragHelper;->mActivePointerId:I
@ -2649,13 +2641,13 @@
return-void
:cond_8
:cond_c
invoke-virtual {p1}, Landroid/view/MotionEvent;->getPointerCount()I
move-result v0
:goto_2
if-ge v2, v0, :cond_a
if-ge v2, v0, :cond_e
invoke-virtual {p1, v2}, Landroid/view/MotionEvent;->getPointerId(I)I
@ -2665,7 +2657,7 @@
move-result v4
if-eqz v4, :cond_9
if-eqz v4, :cond_d
invoke-virtual {p1, v2}, Landroid/view/MotionEvent;->getX(I)F
@ -2691,7 +2683,7 @@
iget v8, p0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
if-eq v8, v3, :cond_a
if-eq v8, v3, :cond_e
float-to-int v4, v4
@ -2705,37 +2697,37 @@
move-result v5
if-eqz v5, :cond_9
if-eqz v5, :cond_d
invoke-virtual {p0, v4, v1}, Landroidx/customview/widget/ViewDragHelper;->tryCaptureViewForDrag(Landroid/view/View;I)Z
move-result v1
if-nez v1, :cond_a
if-nez v1, :cond_e
:cond_9
:cond_d
add-int/lit8 v2, v2, 0x1
goto :goto_2
:cond_a
:cond_e
invoke-direct {p0, p1}, Landroidx/customview/widget/ViewDragHelper;->saveLastMotion(Landroid/view/MotionEvent;)V
return-void
:pswitch_5
:cond_f
iget p1, p0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
if-ne p1, v3, :cond_b
if-ne p1, v3, :cond_10
invoke-direct {p0}, Landroidx/customview/widget/ViewDragHelper;->releaseViewForPointerUp()V
:cond_b
:cond_10
invoke-virtual {p0}, Landroidx/customview/widget/ViewDragHelper;->cancel()V
return-void
:pswitch_6
:cond_11
invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
move-result v0
@ -2768,7 +2760,7 @@
and-int v2, v0, v1
if-eqz v2, :cond_c
if-eqz v2, :cond_12
iget-object v2, p0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
@ -2776,22 +2768,9 @@
invoke-virtual {v2, v0, p1}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
return-void
:cond_c
:cond_12
:goto_3
return-void
:pswitch_data_0
.packed-switch 0x0
:pswitch_6
:pswitch_5
:pswitch_4
:pswitch_3
:pswitch_0
:pswitch_2
:pswitch_1
.end packed-switch
.end method
.method setDragState(I)V
@ -2927,12 +2906,27 @@
const/4 v6, 0x1
packed-switch v2, :pswitch_data_0
if-eqz v2, :cond_c
if-eq v2, v6, :cond_b
if-eq v2, v4, :cond_5
const/4 v7, 0x3
if-eq v2, v7, :cond_b
const/4 v7, 0x5
if-eq v2, v7, :cond_3
const/4 v4, 0x6
if-eq v2, v4, :cond_2
:pswitch_0
goto/16 :goto_2
:pswitch_1
:cond_2
invoke-virtual {v1, v3}, Landroid/view/MotionEvent;->getPointerId(I)I
move-result v1
@ -2941,7 +2935,7 @@
goto/16 :goto_2
:pswitch_2
:cond_3
invoke-virtual {v1, v3}, Landroid/view/MotionEvent;->getPointerId(I)I
move-result v2
@ -2958,7 +2952,7 @@
iget v3, v0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
if-nez v3, :cond_2
if-nez v3, :cond_4
iget-object v1, v0, Landroidx/customview/widget/ViewDragHelper;->mInitialEdgesTouched:[I
@ -2968,7 +2962,7 @@
and-int v4, v1, v3
if-eqz v4, :cond_9
if-eqz v4, :cond_e
iget-object v4, v0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
@ -2978,8 +2972,8 @@
goto/16 :goto_2
:cond_2
if-ne v3, v4, :cond_9
:cond_4
if-ne v3, v4, :cond_e
float-to-int v3, v7
@ -2991,20 +2985,20 @@
iget-object v3, v0, Landroidx/customview/widget/ViewDragHelper;->mCapturedView:Landroid/view/View;
if-ne v1, v3, :cond_9
if-ne v1, v3, :cond_e
invoke-virtual {v0, v1, v2}, Landroidx/customview/widget/ViewDragHelper;->tryCaptureViewForDrag(Landroid/view/View;I)Z
goto/16 :goto_2
:pswitch_3
:cond_5
iget-object v2, v0, Landroidx/customview/widget/ViewDragHelper;->mInitialMotionX:[F
if-eqz v2, :cond_9
if-eqz v2, :cond_e
iget-object v2, v0, Landroidx/customview/widget/ViewDragHelper;->mInitialMotionY:[F
if-eqz v2, :cond_9
if-eqz v2, :cond_e
invoke-virtual/range {p1 .. p1}, Landroid/view/MotionEvent;->getPointerCount()I
@ -3013,7 +3007,7 @@
const/4 v3, 0x0
:goto_0
if-ge v3, v2, :cond_7
if-ge v3, v2, :cond_a
invoke-virtual {v1, v3}, Landroid/view/MotionEvent;->getPointerId(I)I
@ -3023,7 +3017,7 @@
move-result v7
if-eqz v7, :cond_6
if-eqz v7, :cond_9
invoke-virtual {v1, v3}, Landroid/view/MotionEvent;->getX(I)F
@ -3053,23 +3047,23 @@
move-result-object v7
if-eqz v7, :cond_3
if-eqz v7, :cond_6
invoke-direct {v0, v7, v9, v10}, Landroidx/customview/widget/ViewDragHelper;->checkTouchSlop(Landroid/view/View;FF)Z
move-result v8
if-eqz v8, :cond_3
if-eqz v8, :cond_6
const/4 v8, 0x1
goto :goto_1
:cond_3
:cond_6
const/4 v8, 0x0
:goto_1
if-eqz v8, :cond_5
if-eqz v8, :cond_8
invoke-virtual {v7}, Landroid/view/View;->getLeft()I
@ -3111,50 +3105,50 @@
move-result v15
if-eqz v14, :cond_4
if-eqz v14, :cond_7
if-lez v14, :cond_5
if-lez v14, :cond_8
if-ne v12, v11, :cond_5
if-ne v12, v11, :cond_8
:cond_4
if-eqz v15, :cond_7
:cond_7
if-eqz v15, :cond_a
if-lez v15, :cond_5
if-lez v15, :cond_8
if-eq v5, v13, :cond_7
if-eq v5, v13, :cond_a
:cond_5
:cond_8
invoke-direct {v0, v9, v10, v4}, Landroidx/customview/widget/ViewDragHelper;->reportNewEdgeDrags(FFI)V
iget v5, v0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
if-eq v5, v6, :cond_7
if-eq v5, v6, :cond_a
if-eqz v8, :cond_6
if-eqz v8, :cond_9
invoke-virtual {v0, v7, v4}, Landroidx/customview/widget/ViewDragHelper;->tryCaptureViewForDrag(Landroid/view/View;I)Z
move-result v4
if-nez v4, :cond_7
if-nez v4, :cond_a
:cond_6
:cond_9
add-int/lit8 v3, v3, 0x1
goto :goto_0
:cond_7
:cond_a
invoke-direct/range {p0 .. p1}, Landroidx/customview/widget/ViewDragHelper;->saveLastMotion(Landroid/view/MotionEvent;)V
goto :goto_2
:pswitch_4
:cond_b
invoke-virtual/range {p0 .. p0}, Landroidx/customview/widget/ViewDragHelper;->cancel()V
goto :goto_2
:pswitch_5
:cond_c
invoke-virtual/range {p1 .. p1}, Landroid/view/MotionEvent;->getX()F
move-result v2
@ -3181,15 +3175,15 @@
iget-object v3, v0, Landroidx/customview/widget/ViewDragHelper;->mCapturedView:Landroid/view/View;
if-ne v2, v3, :cond_8
if-ne v2, v3, :cond_d
iget v3, v0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
if-ne v3, v4, :cond_8
if-ne v3, v4, :cond_d
invoke-virtual {v0, v2, v1}, Landroidx/customview/widget/ViewDragHelper;->tryCaptureViewForDrag(Landroid/view/View;I)Z
:cond_8
:cond_d
iget-object v2, v0, Landroidx/customview/widget/ViewDragHelper;->mInitialEdgesTouched:[I
aget v2, v2, v1
@ -3198,7 +3192,7 @@
and-int v4, v2, v3
if-eqz v4, :cond_9
if-eqz v4, :cond_e
iget-object v4, v0, Landroidx/customview/widget/ViewDragHelper;->mCallback:Landroidx/customview/widget/ViewDragHelper$Callback;
@ -3206,29 +3200,18 @@
invoke-virtual {v4, v2, v1}, Landroidx/customview/widget/ViewDragHelper$Callback;->onEdgeTouched(II)V
:cond_9
:cond_e
:goto_2
iget v1, v0, Landroidx/customview/widget/ViewDragHelper;->mDragState:I
if-ne v1, v6, :cond_a
if-ne v1, v6, :cond_f
return v6
:cond_a
:cond_f
const/4 v1, 0x0
return v1
:pswitch_data_0
.packed-switch 0x0
:pswitch_5
:pswitch_4
:pswitch_3
:pswitch_4
:pswitch_0
:pswitch_2
:pswitch_1
.end packed-switch
.end method
.method public smoothSlideViewTo(Landroid/view/View;II)Z