Changes of com.discord v889
This commit is contained in:
root
parent
978663884f
commit
dc8b0b8647
7005 changed files with 392258 additions and 379599 deletions
|
|
@ -520,7 +520,7 @@
|
|||
|
||||
move-result-object p0
|
||||
|
||||
if-eqz p0, :cond_3
|
||||
if-eqz p0, :cond_2
|
||||
|
||||
invoke-virtual {p0}, Landroid/graphics/drawable/Drawable;->getOpacity()I
|
||||
|
||||
|
|
@ -534,9 +534,6 @@
|
|||
|
||||
:cond_2
|
||||
return v3
|
||||
|
||||
:cond_3
|
||||
return v3
|
||||
.end method
|
||||
|
||||
|
||||
|
|
@ -885,8 +882,6 @@
|
|||
|
||||
invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
|
||||
|
||||
return-void
|
||||
|
||||
:cond_4
|
||||
:goto_3
|
||||
return-void
|
||||
|
|
@ -1088,14 +1083,16 @@
|
|||
|
||||
const/4 v2, 0x1
|
||||
|
||||
const-string v3, "SlidingPaneLayout"
|
||||
|
||||
if-nez v0, :cond_1
|
||||
|
||||
:try_start_0
|
||||
const-class v0, Landroid/view/View;
|
||||
|
||||
const-string v3, "getDisplayList"
|
||||
const-string v4, "getDisplayList"
|
||||
|
||||
invoke-virtual {v0, v3, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
|
||||
invoke-virtual {v0, v4, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
|
|
@ -1108,8 +1105,6 @@
|
|||
:catch_0
|
||||
move-exception v0
|
||||
|
||||
const-string v3, "SlidingPaneLayout"
|
||||
|
||||
const-string v4, "Couldn\'t fetch getDisplayList method; dimming won\'t work right."
|
||||
|
||||
invoke-static {v3, v4, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
|
||||
|
|
@ -1118,9 +1113,9 @@
|
|||
:try_start_1
|
||||
const-class v0, Landroid/view/View;
|
||||
|
||||
const-string v3, "mRecreateDisplayList"
|
||||
const-string v4, "mRecreateDisplayList"
|
||||
|
||||
invoke-virtual {v0, v3}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
|
||||
invoke-virtual {v0, v4}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
|
|
@ -1137,8 +1132,6 @@
|
|||
:catch_1
|
||||
move-exception v0
|
||||
|
||||
const-string v3, "SlidingPaneLayout"
|
||||
|
||||
const-string v4, "Couldn\'t fetch mRecreateDisplayList field; dimming will be slow."
|
||||
|
||||
invoke-static {v3, v4, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
|
||||
|
|
@ -1172,11 +1165,9 @@
|
|||
:catch_2
|
||||
move-exception v0
|
||||
|
||||
const-string v1, "SlidingPaneLayout"
|
||||
const-string v1, "Error refreshing display list state"
|
||||
|
||||
const-string v2, "Error refreshing display list state"
|
||||
|
||||
invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
|
||||
invoke-static {v3, v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
|
||||
|
||||
goto :goto_3
|
||||
|
||||
|
|
@ -1921,14 +1912,9 @@
|
|||
|
||||
invoke-virtual {v0, v1}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->updateObscuredViewsVisibility(Landroid/view/View;)V
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
goto :goto_d
|
||||
|
||||
:cond_f
|
||||
const/4 v1, 0x0
|
||||
|
||||
:goto_d
|
||||
iput-boolean v1, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mFirstLayout:Z
|
||||
|
||||
return-void
|
||||
|
|
@ -2304,7 +2290,7 @@
|
|||
|
||||
cmpl-float v3, v12, v1
|
||||
|
||||
if-lez v3, :cond_23
|
||||
if-lez v3, :cond_20
|
||||
|
||||
:cond_12
|
||||
iget v1, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mOverhangSize:I
|
||||
|
|
@ -2314,7 +2300,7 @@
|
|||
const/4 v3, 0x0
|
||||
|
||||
:goto_7
|
||||
if-ge v3, v9, :cond_23
|
||||
if-ge v3, v9, :cond_20
|
||||
|
||||
invoke-virtual {v0, v3}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->getChildAt(I)Landroid/view/View;
|
||||
|
||||
|
|
@ -2324,7 +2310,7 @@
|
|||
|
||||
move-result v6
|
||||
|
||||
if-eq v6, v15, :cond_22
|
||||
if-eq v6, v15, :cond_1e
|
||||
|
||||
invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
|
||||
|
||||
|
|
@ -2336,7 +2322,7 @@
|
|||
|
||||
move-result v7
|
||||
|
||||
if-eq v7, v15, :cond_21
|
||||
if-eq v7, v15, :cond_1e
|
||||
|
||||
iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->width:I
|
||||
|
||||
|
|
@ -2370,15 +2356,15 @@
|
|||
move-result v10
|
||||
|
||||
:goto_9
|
||||
if-eqz v11, :cond_1a
|
||||
if-eqz v11, :cond_19
|
||||
|
||||
iget-object v15, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
|
||||
|
||||
if-eq v4, v15, :cond_1a
|
||||
if-eq v4, v15, :cond_19
|
||||
|
||||
iget v15, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->width:I
|
||||
|
||||
if-gez v15, :cond_19
|
||||
if-gez v15, :cond_1e
|
||||
|
||||
if-gt v10, v1, :cond_15
|
||||
|
||||
|
|
@ -2388,7 +2374,7 @@
|
|||
|
||||
cmpl-float v10, v10, v15
|
||||
|
||||
if-lez v10, :cond_19
|
||||
if-lez v10, :cond_1e
|
||||
|
||||
:cond_15
|
||||
if-eqz v7, :cond_18
|
||||
|
|
@ -2453,41 +2439,26 @@
|
|||
|
||||
invoke-virtual {v4, v10, v6}, Landroid/view/View;->measure(II)V
|
||||
|
||||
move/from16 v19, v1
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
const/high16 v6, 0x40000000 # 2.0f
|
||||
|
||||
goto/16 :goto_c
|
||||
|
||||
:cond_19
|
||||
move/from16 v19, v1
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
const/high16 v6, 0x40000000 # 2.0f
|
||||
|
||||
goto/16 :goto_c
|
||||
|
||||
:cond_1a
|
||||
iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->weight:F
|
||||
|
||||
const/4 v15, 0x0
|
||||
|
||||
cmpl-float v7, v7, v15
|
||||
|
||||
if-lez v7, :cond_20
|
||||
if-lez v7, :cond_1e
|
||||
|
||||
iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->width:I
|
||||
|
||||
if-nez v7, :cond_1d
|
||||
if-nez v7, :cond_1c
|
||||
|
||||
iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->height:I
|
||||
|
||||
const/4 v15, -0x2
|
||||
|
||||
if-ne v7, v15, :cond_1b
|
||||
if-ne v7, v15, :cond_1a
|
||||
|
||||
const/high16 v7, -0x80000000
|
||||
|
||||
|
|
@ -2501,12 +2472,12 @@
|
|||
|
||||
goto :goto_b
|
||||
|
||||
:cond_1b
|
||||
:cond_1a
|
||||
iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->height:I
|
||||
|
||||
const/4 v15, -0x1
|
||||
|
||||
if-ne v7, v15, :cond_1c
|
||||
if-ne v7, v15, :cond_1b
|
||||
|
||||
const/high16 v7, 0x40000000 # 2.0f
|
||||
|
||||
|
|
@ -2518,7 +2489,7 @@
|
|||
|
||||
goto :goto_b
|
||||
|
||||
:cond_1c
|
||||
:cond_1b
|
||||
const/high16 v7, 0x40000000 # 2.0f
|
||||
|
||||
iget v15, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->height:I
|
||||
|
|
@ -2529,7 +2500,7 @@
|
|||
|
||||
goto :goto_b
|
||||
|
||||
:cond_1d
|
||||
:cond_1c
|
||||
const/high16 v7, 0x40000000 # 2.0f
|
||||
|
||||
invoke-virtual {v4}, Landroid/view/View;->getMeasuredHeight()I
|
||||
|
|
@ -2541,7 +2512,7 @@
|
|||
move-result v15
|
||||
|
||||
:goto_b
|
||||
if-eqz v11, :cond_1f
|
||||
if-eqz v11, :cond_1d
|
||||
|
||||
iget v7, v6, Landroidx/slidingpanelayout/widget/SlidingPaneLayout$LayoutParams;->leftMargin:I
|
||||
|
||||
|
|
@ -2559,18 +2530,13 @@
|
|||
|
||||
move-result v1
|
||||
|
||||
if-eq v10, v6, :cond_1e
|
||||
if-eq v10, v6, :cond_1f
|
||||
|
||||
invoke-virtual {v4, v1, v15}, Landroid/view/View;->measure(II)V
|
||||
|
||||
:cond_1e
|
||||
const/4 v1, 0x0
|
||||
goto :goto_d
|
||||
|
||||
const/high16 v6, 0x40000000 # 2.0f
|
||||
|
||||
goto :goto_c
|
||||
|
||||
:cond_1f
|
||||
:cond_1d
|
||||
move/from16 v19, v1
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
|
@ -2599,34 +2565,19 @@
|
|||
|
||||
invoke-virtual {v4, v7, v15}, Landroid/view/View;->measure(II)V
|
||||
|
||||
goto :goto_c
|
||||
|
||||
:cond_20
|
||||
move/from16 v19, v1
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
const/high16 v6, 0x40000000 # 2.0f
|
||||
|
||||
goto :goto_c
|
||||
|
||||
:cond_21
|
||||
move/from16 v19, v1
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
const/high16 v6, 0x40000000 # 2.0f
|
||||
|
||||
goto :goto_c
|
||||
|
||||
:cond_22
|
||||
move/from16 v19, v1
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
const/high16 v6, 0x40000000 # 2.0f
|
||||
goto :goto_e
|
||||
|
||||
:cond_1e
|
||||
:goto_c
|
||||
move/from16 v19, v1
|
||||
|
||||
:cond_1f
|
||||
:goto_d
|
||||
const/4 v1, 0x0
|
||||
|
||||
const/high16 v6, 0x40000000 # 2.0f
|
||||
|
||||
:goto_e
|
||||
add-int/lit8 v3, v3, 0x1
|
||||
|
||||
move/from16 v1, v19
|
||||
|
|
@ -2635,7 +2586,7 @@
|
|||
|
||||
goto/16 :goto_7
|
||||
|
||||
:cond_23
|
||||
:cond_20
|
||||
invoke-virtual/range {p0 .. p0}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->getPaddingTop()I
|
||||
|
||||
move-result v1
|
||||
|
|
@ -2658,15 +2609,15 @@
|
|||
|
||||
move-result v1
|
||||
|
||||
if-eqz v1, :cond_24
|
||||
if-eqz v1, :cond_21
|
||||
|
||||
if-nez v11, :cond_24
|
||||
if-nez v11, :cond_21
|
||||
|
||||
iget-object v1, v0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mDragHelper:Landroidx/customview/widget/ViewDragHelper;
|
||||
|
||||
invoke-virtual {v1}, Landroidx/customview/widget/ViewDragHelper;->abort()V
|
||||
|
||||
:cond_24
|
||||
:cond_21
|
||||
return-void
|
||||
.end method
|
||||
|
||||
|
|
@ -2867,7 +2818,7 @@
|
|||
.end method
|
||||
|
||||
.method public onTouchEvent(Landroid/view/MotionEvent;)Z
|
||||
.locals 4
|
||||
.locals 5
|
||||
|
||||
iget-boolean v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mCanSlide:Z
|
||||
|
||||
|
|
@ -2888,18 +2839,22 @@
|
|||
|
||||
move-result v0
|
||||
|
||||
packed-switch v0, :pswitch_data_0
|
||||
const/4 v1, 0x1
|
||||
|
||||
if-eqz v0, :cond_2
|
||||
|
||||
if-eq v0, v1, :cond_1
|
||||
|
||||
goto :goto_0
|
||||
|
||||
:pswitch_0
|
||||
:cond_1
|
||||
iget-object v0, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
|
||||
|
||||
invoke-virtual {p0, v0}, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->isDimmed(Landroid/view/View;)Z
|
||||
|
||||
move-result v0
|
||||
|
||||
if-eqz v0, :cond_1
|
||||
if-eqz v0, :cond_3
|
||||
|
||||
invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
|
||||
|
||||
|
|
@ -2909,47 +2864,47 @@
|
|||
|
||||
move-result p1
|
||||
|
||||
iget v1, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mInitialMotionX:F
|
||||
iget v2, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mInitialMotionX:F
|
||||
|
||||
sub-float v1, v0, v1
|
||||
sub-float v2, v0, v2
|
||||
|
||||
iget v2, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mInitialMotionY:F
|
||||
iget v3, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mInitialMotionY:F
|
||||
|
||||
sub-float v2, p1, v2
|
||||
sub-float v3, p1, v3
|
||||
|
||||
iget-object v3, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mDragHelper:Landroidx/customview/widget/ViewDragHelper;
|
||||
iget-object v4, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mDragHelper:Landroidx/customview/widget/ViewDragHelper;
|
||||
|
||||
invoke-virtual {v3}, Landroidx/customview/widget/ViewDragHelper;->getTouchSlop()I
|
||||
invoke-virtual {v4}, Landroidx/customview/widget/ViewDragHelper;->getTouchSlop()I
|
||||
|
||||
move-result v3
|
||||
|
||||
mul-float v1, v1, v1
|
||||
move-result v4
|
||||
|
||||
mul-float v2, v2, v2
|
||||
|
||||
add-float/2addr v1, v2
|
||||
mul-float v3, v3, v3
|
||||
|
||||
mul-int v3, v3, v3
|
||||
add-float/2addr v2, v3
|
||||
|
||||
int-to-float v2, v3
|
||||
mul-int v4, v4, v4
|
||||
|
||||
cmpg-float v1, v1, v2
|
||||
int-to-float v3, v4
|
||||
|
||||
if-gez v1, :cond_1
|
||||
cmpg-float v2, v2, v3
|
||||
|
||||
iget-object v1, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mDragHelper:Landroidx/customview/widget/ViewDragHelper;
|
||||
if-gez v2, :cond_3
|
||||
|
||||
iget-object v2, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
|
||||
iget-object v2, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mDragHelper:Landroidx/customview/widget/ViewDragHelper;
|
||||
|
||||
iget-object v3, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
|
||||
|
||||
float-to-int v0, v0
|
||||
|
||||
float-to-int p1, p1
|
||||
|
||||
invoke-virtual {v1, v2, v0, p1}, Landroidx/customview/widget/ViewDragHelper;->isViewUnder(Landroid/view/View;II)Z
|
||||
invoke-virtual {v2, v3, v0, p1}, Landroidx/customview/widget/ViewDragHelper;->isViewUnder(Landroid/view/View;II)Z
|
||||
|
||||
move-result p1
|
||||
|
||||
if-eqz p1, :cond_1
|
||||
if-eqz p1, :cond_3
|
||||
|
||||
iget-object p1, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View;
|
||||
|
||||
|
|
@ -2959,7 +2914,7 @@
|
|||
|
||||
goto :goto_0
|
||||
|
||||
:pswitch_1
|
||||
:cond_2
|
||||
invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
|
||||
|
||||
move-result v0
|
||||
|
|
@ -2972,19 +2927,9 @@
|
|||
|
||||
iput p1, p0, Landroidx/slidingpanelayout/widget/SlidingPaneLayout;->mInitialMotionY:F
|
||||
|
||||
:cond_1
|
||||
:cond_3
|
||||
:goto_0
|
||||
const/4 p1, 0x1
|
||||
|
||||
return p1
|
||||
|
||||
nop
|
||||
|
||||
:pswitch_data_0
|
||||
.packed-switch 0x0
|
||||
:pswitch_1
|
||||
:pswitch_0
|
||||
.end packed-switch
|
||||
return v1
|
||||
.end method
|
||||
|
||||
.method public openPane()Z
|
||||
|
|
@ -3549,10 +3494,10 @@
|
|||
:goto_7
|
||||
add-int/lit8 v12, v12, 0x1
|
||||
|
||||
move/from16 v1, v16
|
||||
|
||||
move-object/from16 v0, p1
|
||||
|
||||
move/from16 v1, v16
|
||||
|
||||
goto :goto_3
|
||||
|
||||
:cond_7
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue