Permalink
Browse files

update to 2.4.20

  • Loading branch information...
genokolar committed Apr 20, 2012
1 parent 39c5d12 commit 9f0f5610b3b1f2988fc81d637f1cc172e78a396d
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <bool name="has_multi_touch">true</bool>
+<resources>
<bool name="has_led">true</bool>
</resources>
@@ -274,6 +274,7 @@
.field public static final VERIFICATION_REJECT:I = -0x1
+.field public static final HAS_ACTIVITY:I = 0x20000
# direct methods
.method public constructor <init>()V
@@ -303,7 +303,9 @@
.field mWidthMeasureSpec:I
-.field mTouchPadding:I
+.field mTouchPaddingLeft:I
+
+.field mTouchPaddingRight:I
# direct methods
.method public constructor <init>(Landroid/content/Context;)V
@@ -15811,15 +15813,17 @@
goto :goto_0
.end method
-.method public setTouchPadding(I)V
+.method public setTouchPadding(II)V
.locals 0
- .parameter "padding"
+ .parameter "paddingLeft"
+ .parameter "paddingRight"
.annotation build Landroid/annotation/MiuiHook;
value = .enum Landroid/annotation/MiuiHook$MiuiHookType;->NEW_METHOD:Landroid/annotation/MiuiHook$MiuiHookType;
.end annotation
.prologue
- iput p1, p0, Landroid/widget/AbsListView;->mTouchPadding:I
+ iput p1, p0, Landroid/widget/AbsListView;->mTouchPaddingLeft:I
+ iput p2, p0, Landroid/widget/AbsListView;->mTouchPaddingRight:I
return-void
.end method
@@ -15836,11 +15840,7 @@
move-result v0
- iget v1, p0, Landroid/widget/AbsListView;->mPaddingLeft:I
-
- iget v2, p0, Landroid/widget/AbsListView;->mTouchPadding:I
-
- add-int/2addr v1, v2
+ iget v1, p0, Landroid/widget/AbsListView;->mTouchPaddingLeft:I
int-to-float v1, v1
@@ -15856,11 +15856,7 @@
move-result v1
- iget v2, p0, Landroid/widget/AbsListView;->mPaddingLeft:I
-
- sub-int/2addr v1, v2
-
- iget v2, p0, Landroid/widget/AbsListView;->mTouchPadding:I
+ iget v2, p0, Landroid/widget/AbsListView;->mTouchPaddingRight:I
sub-int/2addr v1, v2
@@ -509,21 +509,21 @@
.end method
.method protected onDraw(Landroid/graphics/Canvas;)V
- .locals 5
+ .locals 6
.parameter "canvas"
.prologue
- const/4 v4, 0x0
+ const/4 v5, 0x0
.line 109
invoke-super {p0, p1}, Landroid/widget/ImageView;->onDraw(Landroid/graphics/Canvas;)V
.line 111
invoke-virtual {p0}, Landroid/widget/QuickContactBadge;->isEnabled()Z
- move-result v1
+ move-result v2
- if-nez v1, :cond_1
+ if-nez v2, :cond_1
.line 133
:cond_0
@@ -532,83 +532,96 @@
.line 116
:cond_1
- iget-object v1, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
+ iget-object v2, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
- if-eqz v1, :cond_0
+ if-eqz v2, :cond_0
- iget-object v1, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
+ iget-object v2, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
- invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
+ invoke-virtual {v2}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
- move-result v1
+ move-result v2
- if-eqz v1, :cond_0
+ if-eqz v2, :cond_0
- iget-object v1, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
+ iget-object v2, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
- invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
+ invoke-virtual {v2}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
- move-result v1
+ move-result v2
- if-eqz v1, :cond_0
+ if-eqz v2, :cond_0
.line 122
- iget-object v1, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
+ iget-object v2, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
invoke-virtual {p0}, Landroid/widget/QuickContactBadge;->getWidth()I
- move-result v2
+ move-result v3
invoke-virtual {p0}, Landroid/widget/QuickContactBadge;->getHeight()I
- move-result v3
+ move-result v4
- invoke-virtual {v1, v4, v4, v2, v3}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+ invoke-virtual {v2, v5, v5, v3, v4}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+
+ iget v2, p0, Landroid/widget/QuickContactBadge;->mPaddingTop:I
+ if-nez v2, :cond_2
.line 124
- iget v1, p0, Landroid/widget/QuickContactBadge;->mPaddingTop:I
+ iget v2, p0, Landroid/widget/QuickContactBadge;->mPaddingTop:I
- if-nez v1, :cond_2
+ if-nez v2, :cond_2
- iget v1, p0, Landroid/widget/QuickContactBadge;->mPaddingLeft:I
+ iget v2, p0, Landroid/widget/QuickContactBadge;->mPaddingBottom:I
- if-nez v1, :cond_2
+ if-nez v2, :cond_2
.line 125
- iget-object v1, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
+ iget v2, p0, Landroid/widget/QuickContactBadge;->mPaddingRight:I
- invoke-virtual {v1, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
+ if-nez v2, :cond_2
+ iget-object v2, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
+
+ invoke-virtual {v2, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
goto :goto_0
.line 127
:cond_2
- invoke-virtual {p1}, Landroid/graphics/Canvas;->getSaveCount()I
+ invoke-virtual {p0}, Landroid/widget/QuickContactBadge;->getWidth()I
- move-result v0
+ move-result v2
.line 128
- .local v0, saveCount:I
- invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
+ iget v3, p0, Landroid/widget/QuickContactBadge;->mPaddingRight:I
.line 129
- iget v1, p0, Landroid/widget/QuickContactBadge;->mPaddingLeft:I
+ sub-int v1, v2, v3
+
+ .local v1, right:I
+ invoke-virtual {p0}, Landroid/widget/QuickContactBadge;->getHeight()I
- int-to-float v1, v1
+ move-result v2
- iget v2, p0, Landroid/widget/QuickContactBadge;->mPaddingTop:I
+ iget v3, p0, Landroid/widget/QuickContactBadge;->mPaddingBottom:I
+
+ sub-int v0, v2, v3
+
+ .local v0, bottom:I
+ iget-object v2, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
- int-to-float v2, v2
+ iget v3, p0, Landroid/widget/QuickContactBadge;->mPaddingLeft:I
- invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->translate(FF)V
+ iget v4, p0, Landroid/widget/QuickContactBadge;->mPaddingTop:I
.line 130
- iget-object v1, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
+ invoke-virtual {v2, v3, v4, v1, v0}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
- invoke-virtual {v1, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
+ iget-object v2, p0, Landroid/widget/QuickContactBadge;->mOverlay:Landroid/graphics/drawable/Drawable;
.line 131
- invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
+ invoke-virtual {v2, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
goto :goto_0
.end method
@@ -1686,6 +1686,23 @@
.prologue
.line 177
+ iget-object v0, p0, Lcom/android/internal/app/ActionBarImpl;->mActivity:Landroid/app/Activity;
+
+ invoke-virtual {v0}, Landroid/app/Activity;->isResumed()Z
+
+ move-result v0
+
+ if-nez v0, :cond_0
+
+ iget-object v0, p0, Lcom/android/internal/app/ActionBarImpl;->mContainerView:Lcom/android/internal/widget/ActionBarContainer;
+
+ invoke-virtual {v0, p1}, Lcom/android/internal/widget/ActionBarContainer;->dispatchConfigurationChanged(Landroid/content/res/Configuration;)V
+
+ iget-object v0, p0, Lcom/android/internal/app/ActionBarImpl;->mSplitView:Lcom/android/internal/widget/ActionBarContainer;
+
+ invoke-virtual {v0, p1}, Lcom/android/internal/widget/ActionBarContainer;->dispatchConfigurationChanged(Landroid/content/res/Configuration;)V
+
+ :cond_0
iget-object v0, p0, Lcom/android/internal/app/ActionBarImpl;->mContext:Landroid/content/Context;
invoke-virtual {v0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
@@ -2496,7 +2513,7 @@
.line 312
new-instance v0, Ljava/lang/IllegalStateException;
- const-string/jumbo v1, "setSelectedNavigationIndex not valid for current navigation mode"
+ const-string v1, "setSelectedNavigationIndex not valid for current navigation mode"
invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
@@ -21,6 +21,7 @@
.field private mUpWidth:I
+.field private mIconDrawable:Landroid/graphics/drawable/Drawable;
# direct methods
.method public constructor <init>(Landroid/content/Context;)V
@@ -80,29 +81,12 @@
.end method
.method public getLeftOffset()I
- .locals 2
+ .locals 1
.prologue
- .line 1239
- iget-object v0, p0, Lcom/android/internal/widget/ActionBarView$HomeView;->mUpView:Landroid/view/View;
-
- invoke-virtual {v0}, Landroid/view/View;->getVisibility()I
-
- move-result v0
-
- const/16 v1, 0x8
-
- if-ne v0, v1, :cond_0
-
- iget v0, p0, Lcom/android/internal/widget/ActionBarView$HomeView;->mUpWidth:I
-
- :goto_0
- return v0
-
- :cond_0
const/4 v0, 0x0
- goto :goto_0
+ return v0
.end method
.method protected onFinishInflate()V
@@ -600,14 +584,14 @@
.end method
.method public setIcon(Landroid/graphics/drawable/Drawable;)V
- .locals 1
+ .locals 0
.parameter "icon"
.prologue
.line 1208
- iget-object v0, p0, Lcom/android/internal/widget/ActionBarView$HomeView;->mIconView:Landroid/widget/ImageView;
+ iput-object p1, p0, Lcom/android/internal/widget/ActionBarView$HomeView;->mIconDrawable:Landroid/graphics/drawable/Drawable;
- invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
+ invoke-direct {p0}, Lcom/android/internal/widget/ActionBarView$HomeView;->setIcon()V
.line 1209
return-void
@@ -629,6 +613,7 @@
invoke-virtual {v1, v0}, Landroid/view/View;->setVisibility(I)V
.line 1205
+ invoke-direct {p0}, Lcom/android/internal/widget/ActionBarView$HomeView;->setIcon()V
return-void
.line 1204
@@ -637,3 +622,36 @@
goto :goto_0
.end method
+
+.method private setIcon()V
+ .locals 2
+
+ .prologue
+ .line 1239
+ iget-object v0, p0, Lcom/android/internal/widget/ActionBarView$HomeView;->mUpView:Landroid/view/View;
+
+ invoke-virtual {v0}, Landroid/view/View;->getVisibility()I
+
+ move-result v0
+
+ if-nez v0, :cond_0
+
+ .line 1250
+ iget-object v0, p0, Lcom/android/internal/widget/ActionBarView$HomeView;->mIconView:Landroid/widget/ImageView;
+
+ const/4 v1, 0x0
+
+ invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
+
+ :goto_0
+ return-void
+
+ :cond_0
+ iget-object v0, p0, Lcom/android/internal/widget/ActionBarView$HomeView;->mIconView:Landroid/widget/ImageView;
+
+ iget-object v1, p0, Lcom/android/internal/widget/ActionBarView$HomeView;->mIconDrawable:Landroid/graphics/drawable/Drawable;
+
+ invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
+
+ goto :goto_0
+.end method
Oops, something went wrong.

0 comments on commit 9f0f561

Please sign in to comment.