Advertisement
Guest User

Untitled

a guest
Aug 23rd, 2011
346
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.37 KB | None | 0 0
  1. --- a/smali/com/kddi/android/iida/iidahome/iidahome/VelocityScrollView.smali
  2. +++ b/smali/com/kddi/android/iida/iidahome/iidahome/VelocityScrollView.smali
  3. @@ -42,10 +42,6 @@
  4.  
  5.  .field private mDeltY:I
  6.  
  7. -.field private mEdgeGlowBottom:Landroid/widget/EdgeGlow;
  8. -
  9. -.field private mEdgeGlowTop:Landroid/widget/EdgeGlow;
  10. -
  11.  .field private mFillViewport:Z
  12.  
  13.  .field private mFitting:Z
  14. @@ -1946,7 +1942,6 @@
  15.  
  16.      .line 209
  17.      :cond_0
  18. -    invoke-virtual {p0, v4}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->setOverScrollMode(I)V
  19.  
  20.      .line 210
  21.      iget-object v1, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mContext:Landroid/content/Context;
  22. @@ -3622,7 +3617,7 @@
  23.  
  24.      move-object/from16 v5, p0
  25.  
  26. -    invoke-virtual/range {v5 .. v14}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->overScrollBy(IIIIIIIIZ)Z
  27. +    invoke-virtual {v5, v6, v7}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->scrollBy(II)V
  28.  
  29.      .line 1421
  30.      move-object/from16 v0, p0
  31. @@ -3796,7 +3791,7 @@
  32.  
  33.      move-object/from16 v5, p0
  34.  
  35. -    invoke-virtual/range {v5 .. v14}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->overScrollBy(IIIIIIIIZ)Z
  36. +    invoke-virtual {v5, v6, v7}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->scrollBy(II)V
  37.  
  38.      .line 1458
  39.      move-object/from16 v0, p0
  40. @@ -4361,7 +4356,7 @@
  41.  
  42.      move-object/from16 v5, p0
  43.  
  44. -    invoke-virtual/range {v5 .. v14}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->overScrollBy(IIIIIIIIZ)Z
  45. +    invoke-virtual {v5, v6, v7}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->scrollBy(II)V
  46.  
  47.      .line 1500
  48.      move-object/from16 v0, p0
  49. @@ -4890,157 +4885,7 @@
  50.      :try_end_0
  51.      .catchall {:try_start_0 .. :try_end_0} :catchall_0
  52.  
  53. -    .line 1834
  54. -    iget-object v0, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowTop:Landroid/widget/EdgeGlow;
  55. -
  56. -    if-eqz v0, :cond_3
  57. -
  58. -    .line 1835
  59. -    iget v0, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mScrollY:I
  60. -
  61. -    .line 1836
  62. -    iget-object v1, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowTop:Landroid/widget/EdgeGlow;
  63. -
  64. -    invoke-virtual {v1}, Landroid/widget/EdgeGlow;->isFinished()Z
  65. -
  66. -    move-result v1
  67. -
  68. -    if-nez v1, :cond_1
  69. -
  70. -    .line 1837
  71. -    invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
  72. -
  73. -    move-result v1
  74. -
  75. -    .line 1838
  76. -    invoke-virtual {p0}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->getWidth()I
  77. -
  78. -    move-result v2
  79. -
  80. -    .line 1840
  81. -    neg-int v3, v2
  82. -
  83. -    div-int/lit8 v3, v3, 0x2
  84. -
  85. -    int-to-float v3, v3
  86. -
  87. -    const/4 v4, 0x0
  88. -
  89. -    invoke-static {v4, v0}, Ljava/lang/Math;->min(II)I
  90. -
  91. -    move-result v4
  92. -
  93. -    int-to-float v4, v4
  94. -
  95. -    invoke-virtual {p1, v3, v4}, Landroid/graphics/Canvas;->translate(FF)V
  96. -
  97. -    .line 1841
  98. -    iget-object v3, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowTop:Landroid/widget/EdgeGlow;
  99. -
  100. -    mul-int/lit8 v2, v2, 0x2
  101. -
  102. -    invoke-virtual {p0}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->getHeight()I
  103. -
  104. -    move-result v4
  105. -
  106. -    invoke-virtual {v3, v2, v4}, Landroid/widget/EdgeGlow;->setSize(II)V
  107. -
  108. -    .line 1842
  109. -    iget-object v2, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowTop:Landroid/widget/EdgeGlow;
  110. -
  111. -    invoke-virtual {v2, p1}, Landroid/widget/EdgeGlow;->draw(Landroid/graphics/Canvas;)Z
  112. -
  113. -    move-result v2
  114. -
  115. -    if-eqz v2, :cond_0
  116. -
  117. -    .line 1843
  118. -    invoke-virtual {p0}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->invalidate()V
  119. -
  120. -    .line 1845
  121. -    :cond_0
  122. -    invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->restoreToCount(I)V
  123. -
  124. -    .line 1847
  125. -    :cond_1
  126. -    iget-object v1, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowBottom:Landroid/widget/EdgeGlow;
  127. -
  128. -    invoke-virtual {v1}, Landroid/widget/EdgeGlow;->isFinished()Z
  129. -
  130. -    move-result v1
  131. -
  132. -    if-nez v1, :cond_3
  133. -
  134. -    .line 1848
  135. -    invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
  136. -
  137. -    move-result v1
  138. -
  139. -    .line 1849
  140. -    invoke-virtual {p0}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->getWidth()I
  141. -
  142. -    move-result v2
  143. -
  144. -    .line 1850
  145. -    invoke-virtual {p0}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->getHeight()I
  146. -
  147. -    move-result v3
  148. -
  149. -    .line 1852
  150. -    neg-int v4, v2
  151. -
  152. -    div-int/lit8 v4, v4, 0x2
  153. -
  154. -    int-to-float v4, v4
  155. -
  156. -    invoke-direct {p0}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->getScrollRange()I
  157. -
  158. -    move-result v5
  159. -
  160. -    invoke-static {v5, v0}, Ljava/lang/Math;->max(II)I
  161. -
  162. -    move-result v0
  163. -
  164. -    add-int/2addr v0, v3
  165. -
  166. -    int-to-float v0, v0
  167. -
  168. -    invoke-virtual {p1, v4, v0}, Landroid/graphics/Canvas;->translate(FF)V
  169. -
  170. -    .line 1853
  171. -    const/high16 v0, 0x4334
  172. -
  173. -    int-to-float v4, v2
  174. -
  175. -    const/4 v5, 0x0
  176. -
  177. -    invoke-virtual {p1, v0, v4, v5}, Landroid/graphics/Canvas;->rotate(FFF)V
  178. -
  179. -    .line 1854
  180. -    iget-object v0, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowBottom:Landroid/widget/EdgeGlow;
  181. -
  182. -    mul-int/lit8 v2, v2, 0x2
  183. -
  184. -    invoke-virtual {v0, v2, v3}, Landroid/widget/EdgeGlow;->setSize(II)V
  185. -
  186. -    .line 1855
  187. -    iget-object v0, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowBottom:Landroid/widget/EdgeGlow;
  188. -
  189. -    invoke-virtual {v0, p1}, Landroid/widget/EdgeGlow;->draw(Landroid/graphics/Canvas;)Z
  190. -
  191. -    move-result v0
  192. -
  193. -    if-eqz v0, :cond_2
  194. -
  195. -    .line 1856
  196. -    invoke-virtual {p0}, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->invalidate()V
  197. -
  198. -    .line 1858
  199. -    :cond_2
  200. -    invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->restoreToCount(I)V
  201. -
  202.      .line 1861
  203. -    :cond_3
  204.      return-void
  205.  
  206.      .line 1833
  207. @@ -8046,33 +7891,7 @@
  208.  
  209.      .line 712
  210.      :cond_f
  211. -    move-object/from16 v0, p0
  212. -
  213. -    iget-object v0, v0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowTop:Landroid/widget/EdgeGlow;
  214. -
  215. -    move-object v5, v0
  216. -
  217. -    if-eqz v5, :cond_2
  218. -
  219. -    .line 713
  220. -    move-object/from16 v0, p0
  221. -
  222. -    iget-object v0, v0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowTop:Landroid/widget/EdgeGlow;
  223. -
  224. -    move-object v5, v0
  225. -
  226. -    invoke-virtual {v5}, Landroid/widget/EdgeGlow;->onRelease()V
  227. -
  228. -    .line 714
  229. -    move-object/from16 v0, p0
  230. -
  231. -    iget-object v0, v0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowBottom:Landroid/widget/EdgeGlow;
  232. -
  233. -    move-object v5, v0
  234. -
  235. -    invoke-virtual {v5}, Landroid/widget/EdgeGlow;->onRelease()V
  236. -
  237. -    goto/16 :goto_1
  238. +    goto :cond_2
  239.  
  240.      .line 684
  241.      .restart local p1
  242. @@ -8903,16 +8722,6 @@
  243.      .parameter "mode"
  244.  
  245.      .prologue
  246. -    const/4 v0, 0x0
  247. -
  248. -    .line 1816
  249. -    iput-object v0, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowTop:Landroid/widget/EdgeGlow;
  250. -
  251. -    .line 1817
  252. -    iput-object v0, p0, Lcom/kddi/android/iida/iidahome/iidahome/VelocityScrollView;->mEdgeGlowBottom:Landroid/widget/EdgeGlow;
  253. -
  254. -    .line 1818
  255. -    invoke-super {p0, p1}, Landroid/widget/FrameLayout;->setOverScrollMode(I)V
  256.  
  257.      .line 1819
  258.      return-void
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement