patches/tabletUI/4.2/cm/20130625/SystemUI.apk.patch

   1 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/phone/NavbarEditor.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/phone/NavbarEditor.smali
   2 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/phone/NavbarEditor.smali
   3 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/phone/NavbarEditor.smali
   4 @@ -609,7 +609,7 @@
   5      if-ge v2, v4, :cond_1
   6
   7      .line 141
   8 -    const/4 v4, 0x1
   9 +    const/4 v4, 0x0
  10
  11      invoke-static {v4}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
  12
  13 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DateView.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DateView.smali
  14 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DateView.smali
  15 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DateView.smali
  16 @@ -361,43 +361,6 @@
  17      return-void
  18  .end method
  19
  20 -.method protected onDraw(Landroid/graphics/Canvas;)V
  21 -    .locals 1
  22 -    .parameter "canvas"
  23 -
  24 -    .prologue
  25 -    .line 90
  26 -    iget-object v0, p0, Lcom/android/systemui/statusbar/policy/DateView;->mParent:Landroid/widget/RelativeLayout;
  27 -
  28 -    if-nez v0, :cond_0
  29 -
  30 -    .line 91
  31 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/DateView;->getParent()Landroid/view/ViewParent;
  32 -
  33 -    move-result-object v0
  34 -
  35 -    check-cast v0, Landroid/widget/RelativeLayout;
  36 -
  37 -    iput-object v0, p0, Lcom/android/systemui/statusbar/policy/DateView;->mParent:Landroid/widget/RelativeLayout;
  38 -
  39 -    .line 92
  40 -    iget-object v0, p0, Lcom/android/systemui/statusbar/policy/DateView;->mParent:Landroid/widget/RelativeLayout;
  41 -
  42 -    invoke-virtual {v0, p0}, Landroid/widget/RelativeLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
  43 -
  44 -    .line 93
  45 -    iget-object v0, p0, Lcom/android/systemui/statusbar/policy/DateView;->mParent:Landroid/widget/RelativeLayout;
  46 -
  47 -    invoke-virtual {v0, p0}, Landroid/widget/RelativeLayout;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
  48 -
  49 -    .line 96
  50 -    :cond_0
  51 -    invoke-super {p0, p1}, Landroid/widget/TextView;->onDraw(Landroid/graphics/Canvas;)V
  52 -
  53 -    .line 97
  54 -    return-void
  55 -.end method
  56 -
  57  .method public onLongClick(Landroid/view/View;)Z
  58      .locals 2
  59      .parameter "v"
  60 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/phone/PhoneStatusBar.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/phone/PhoneStatusBar.smali
  61 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/phone/PhoneStatusBar.smali
  62 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/phone/PhoneStatusBar.smali
  63 @@ -7156,22 +7156,6 @@
  64
  65      invoke-virtual {v5, v0}, Lcom/android/systemui/statusbar/policy/BatteryController;->addLabelView(Landroid/widget/TextView;)V
  66
  67 -    .line 612
  68 -    iget-object v0, p0, Lcom/android/systemui/statusbar/phone/PhoneStatusBar;->mStatusBarView:Lcom/android/systemui/statusbar/phone/PhoneStatusBarView;
  69 -
  70 -    const v5, 0x7f09005d
  71 -
  72 -    invoke-virtual {v0, v5}, Lcom/android/systemui/statusbar/phone/PhoneStatusBarView;->findViewById(I)Landroid/view/View;
  73 -
  74 -    move-result-object v0
  75 -
  76 -    check-cast v0, Lcom/android/systemui/statusbar/policy/CircleBattery;
  77 -
  78 -    .line 614
  79 -    iget-object v5, p0, Lcom/android/systemui/statusbar/phone/PhoneStatusBar;->mBatteryController:Lcom/android/systemui/statusbar/policy/BatteryController;
  80 -
  81 -    invoke-virtual {v5, v0}, Lcom/android/systemui/statusbar/policy/BatteryController;->addStateChangedCallback(Lcom/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback;)V
  82 -
  83      .line 617
  84      iget-object v0, p0, Lcom/android/systemui/statusbar/phone/PhoneStatusBar;->mContext:Landroid/content/Context;
  85
  86 @@ -7230,22 +7214,6 @@
  87      check-cast v0, Landroid/widget/TextView;
  88
  89      invoke-virtual {v5, v0}, Lcom/android/systemui/statusbar/policy/DockBatteryController;->addLabelView(Landroid/widget/TextView;)V
  90 -
  91 -    .line 627
  92 -    iget-object v0, p0, Lcom/android/systemui/statusbar/phone/PhoneStatusBar;->mStatusBarView:Lcom/android/systemui/statusbar/phone/PhoneStatusBarView;
  93 -
  94 -    const v5, 0x7f09005a
  95 -
  96 -    invoke-virtual {v0, v5}, Lcom/android/systemui/statusbar/phone/PhoneStatusBarView;->findViewById(I)Landroid/view/View;
  97 -
  98 -    move-result-object v0
  99 -
 100 -    check-cast v0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;
 101 -
 102 -    .line 631
 103 -    iget-object v5, p0, Lcom/android/systemui/statusbar/phone/PhoneStatusBar;->mDockBatteryController:Lcom/android/systemui/statusbar/policy/DockBatteryController;
 104 -
 105 -    invoke-virtual {v5, v0}, Lcom/android/systemui/statusbar/policy/DockBatteryController;->addStateChangedCallback(Lcom/android/systemui/statusbar/policy/DockBatteryController$DockBatteryStateChangeCallback;)V
 106
 107      .line 642
 108      :cond_6
 109 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/tablet/TabletStatusBar.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/tablet/TabletStatusBar.smali
 110 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/tablet/TabletStatusBar.smali
 111 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/tablet/TabletStatusBar.smali
 112 @@ -3065,20 +3065,6 @@
 113
 114      invoke-virtual {v3, v1}, Lcom/android/systemui/statusbar/policy/BatteryController;->addIconView(Landroid/widget/ImageView;)V
 115
 116 -    .line 554
 117 -    const v1, 0x7f09005d
 118 -
 119 -    invoke-virtual {v0, v1}, Lcom/android/systemui/statusbar/tablet/TabletStatusBarView;->findViewById(I)Landroid/view/View;
 120 -
 121 -    move-result-object v1
 122 -
 123 -    check-cast v1, Lcom/android/systemui/statusbar/policy/CircleBattery;
 124 -
 125 -    .line 556
 126 -    iget-object v3, p0, Lcom/android/systemui/statusbar/tablet/TabletStatusBar;->mBatteryController:Lcom/android/systemui/statusbar/policy/BatteryController;
 127 -
 128 -    invoke-virtual {v3, v1}, Lcom/android/systemui/statusbar/policy/BatteryController;->addStateChangedCallback(Lcom/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback;)V
 129 -
 130      .line 558
 131      new-instance v1, Lcom/android/systemui/statusbar/policy/BluetoothController;
 132
 133 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback.smali
 134 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback.smali
 135 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback.smali
 136 @@ -15,5 +15,5 @@
 137
 138
 139  # virtual methods
 140 -.method public abstract onBatteryLevelChanged(II)V
 141 +.method public abstract onBatteryLevelChanged(IZ)V
 142  .end method
 143 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/BatteryController.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/BatteryController.smali
 144 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/BatteryController.smali
 145 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/BatteryController.smali
 146 @@ -270,11 +270,11 @@
 147
 148      move-result v0
 149
 150 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/BatteryController;->getBatteryStatus()I
 151 +    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/BatteryController;->isBatteryStatusCharging()Z
 152
 153      move-result v1
 154
 155 -    invoke-interface {p1, v0, v1}, Lcom/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback;->onBatteryLevelChanged(II)V
 156 +    invoke-interface {p1, v0, v1}, Lcom/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback;->onBatteryLevelChanged(IZ)V
 157
 158      .line 124
 159      return-void
 160 @@ -845,11 +845,11 @@
 161
 162      .line 212
 163      .local v1, cb:Lcom/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback;
 164 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/BatteryController;->getBatteryStatus()I
 165 +    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/BatteryController;->isBatteryStatusCharging()Z
 166
 167      move-result v6
 168
 169 -    invoke-interface {v1, v4, v6}, Lcom/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback;->onBatteryLevelChanged(II)V
 170 +    invoke-interface {v1, v4, v6}, Lcom/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback;->onBatteryLevelChanged(IZ)V
 171
 172      goto :goto_2
 173
 174 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver.smali
 175 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver.smali
 176 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver.smali
 177 @@ -0,0 +1,300 @@
 178 +.class Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 179 +.super Landroid/content/BroadcastReceiver;
 180 +.source "CircleBattery.java"
 181 +
 182 +
 183 +# annotations
 184 +.annotation system Ldalvik/annotation/EnclosingClass;
 185 +    value = Lcom/android/systemui/statusbar/policy/CircleBattery;
 186 +.end annotation
 187 +
 188 +.annotation system Ldalvik/annotation/InnerClass;
 189 +    accessFlags = 0x0
 190 +    name = "BatteryReceiver"
 191 +.end annotation
 192 +
 193 +
 194 +# instance fields
 195 +.field private mIsRegistered:Z
 196 +
 197 +.field final synthetic this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 198 +
 199 +
 200 +# direct methods
 201 +.method public constructor <init>(Lcom/android/systemui/statusbar/policy/CircleBattery;Landroid/content/Context;)V
 202 +    .locals 1
 203 +    .parameter
 204 +    .parameter "context"
 205 +
 206 +    .prologue
 207 +    .line 131
 208 +    iput-object p1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 209 +
 210 +    invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
 211 +
 212 +    .line 129
 213 +    const/4 v0, 0x0
 214 +
 215 +    iput-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->mIsRegistered:Z
 216 +
 217 +    .line 132
 218 +    return-void
 219 +.end method
 220 +
 221 +.method static synthetic access$500(Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;)V
 222 +    .locals 0
 223 +    .parameter "x0"
 224 +
 225 +    .prologue
 226 +    .line 128
 227 +    invoke-direct {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->updateRegistration()V
 228 +
 229 +    return-void
 230 +.end method
 231 +
 232 +.method private registerSelf()V
 233 +    .locals 3
 234 +
 235 +    .prologue
 236 +    .line 156
 237 +    iget-boolean v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->mIsRegistered:Z
 238 +
 239 +    if-nez v1, :cond_0
 240 +
 241 +    .line 157
 242 +    const/4 v1, 0x1
 243 +
 244 +    iput-boolean v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->mIsRegistered:Z
 245 +
 246 +    .line 159
 247 +    new-instance v0, Landroid/content/IntentFilter;
 248 +
 249 +    invoke-direct {v0}, Landroid/content/IntentFilter;-><init>()V
 250 +
 251 +    .line 160
 252 +    .local v0, filter:Landroid/content/IntentFilter;
 253 +    const-string v1, "android.intent.action.BATTERY_CHANGED"
 254 +
 255 +    invoke-virtual {v0, v1}, Landroid/content/IntentFilter;->addAction(Ljava/lang/String;)V
 256 +
 257 +    .line 161
 258 +    iget-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 259 +
 260 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mContext:Landroid/content/Context;
 261 +    invoke-static {v1}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$200(Lcom/android/systemui/statusbar/policy/CircleBattery;)Landroid/content/Context;
 262 +
 263 +    move-result-object v1
 264 +
 265 +    iget-object v2, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 266 +
 267 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryReceiver:Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 268 +    invoke-static {v2}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$400(Lcom/android/systemui/statusbar/policy/CircleBattery;)Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 269 +
 270 +    move-result-object v2
 271 +
 272 +    invoke-virtual {v1, v2, v0}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
 273 +
 274 +    .line 163
 275 +    .end local v0           #filter:Landroid/content/IntentFilter;
 276 +    :cond_0
 277 +    return-void
 278 +.end method
 279 +
 280 +.method private unregisterSelf()V
 281 +    .locals 1
 282 +
 283 +    .prologue
 284 +    .line 166
 285 +    iget-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->mIsRegistered:Z
 286 +
 287 +    if-eqz v0, :cond_0
 288 +
 289 +    .line 167
 290 +    const/4 v0, 0x0
 291 +
 292 +    iput-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->mIsRegistered:Z
 293 +
 294 +    .line 168
 295 +    iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 296 +
 297 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mContext:Landroid/content/Context;
 298 +    invoke-static {v0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$200(Lcom/android/systemui/statusbar/policy/CircleBattery;)Landroid/content/Context;
 299 +
 300 +    move-result-object v0
 301 +
 302 +    invoke-virtual {v0, p0}, Landroid/content/Context;->unregisterReceiver(Landroid/content/BroadcastReceiver;)V
 303 +
 304 +    .line 170
 305 +    :cond_0
 306 +    return-void
 307 +.end method
 308 +
 309 +.method private updateRegistration()V
 310 +    .locals 1
 311 +
 312 +    .prologue
 313 +    .line 173
 314 +    iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 315 +
 316 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mActivated:Z
 317 +    invoke-static {v0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$000(Lcom/android/systemui/statusbar/policy/CircleBattery;)Z
 318 +
 319 +    move-result v0
 320 +
 321 +    if-eqz v0, :cond_0
 322 +
 323 +    iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 324 +
 325 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mAttached:Z
 326 +    invoke-static {v0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$100(Lcom/android/systemui/statusbar/policy/CircleBattery;)Z
 327 +
 328 +    move-result v0
 329 +
 330 +    if-eqz v0, :cond_0
 331 +
 332 +    .line 174
 333 +    invoke-direct {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->registerSelf()V
 334 +
 335 +    .line 178
 336 +    :goto_0
 337 +    return-void
 338 +
 339 +    .line 176
 340 +    :cond_0
 341 +    invoke-direct {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->unregisterSelf()V
 342 +
 343 +    goto :goto_0
 344 +.end method
 345 +
 346 +
 347 +# virtual methods
 348 +.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
 349 +    .locals 5
 350 +    .parameter "context"
 351 +    .parameter "intent"
 352 +
 353 +    .prologue
 354 +    .line 136
 355 +    invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 356 +
 357 +    move-result-object v0
 358 +
 359 +    .line 137
 360 +    .local v0, action:Ljava/lang/String;
 361 +    const-string v3, "android.intent.action.BATTERY_CHANGED"
 362 +
 363 +    invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 364 +
 365 +    move-result v3
 366 +
 367 +    if-eqz v3, :cond_1
 368 +
 369 +    .line 138
 370 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 371 +
 372 +    invoke-virtual {v3, p2}, Lcom/android/systemui/statusbar/policy/CircleBattery;->onBatteryStatusChange(Landroid/content/Intent;)V
 373 +
 374 +    .line 140
 375 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 376 +
 377 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mActivated:Z
 378 +    invoke-static {v3}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$000(Lcom/android/systemui/statusbar/policy/CircleBattery;)Z
 379 +
 380 +    move-result v3
 381 +
 382 +    if-eqz v3, :cond_2
 383 +
 384 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 385 +
 386 +    invoke-virtual {v3}, Lcom/android/systemui/statusbar/policy/CircleBattery;->isBatteryPresent()Z
 387 +
 388 +    move-result v3
 389 +
 390 +    if-eqz v3, :cond_2
 391 +
 392 +    const/4 v2, 0x0
 393 +
 394 +    .line 141
 395 +    .local v2, visibility:I
 396 +    :goto_0
 397 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 398 +
 399 +    invoke-virtual {v3}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getVisibility()I
 400 +
 401 +    move-result v3
 402 +
 403 +    if-eq v3, v2, :cond_0
 404 +
 405 +    .line 142
 406 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 407 +
 408 +    invoke-virtual {v3, v2}, Lcom/android/systemui/statusbar/policy/CircleBattery;->setVisibility(I)V
 409 +
 410 +    .line 145
 411 +    :cond_0
 412 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 413 +
 414 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mActivated:Z
 415 +    invoke-static {v3}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$000(Lcom/android/systemui/statusbar/policy/CircleBattery;)Z
 416 +
 417 +    move-result v3
 418 +
 419 +    if-eqz v3, :cond_1
 420 +
 421 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 422 +
 423 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mAttached:Z
 424 +    invoke-static {v3}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$100(Lcom/android/systemui/statusbar/policy/CircleBattery;)Z
 425 +
 426 +    move-result v3
 427 +
 428 +    if-eqz v3, :cond_1
 429 +
 430 +    .line 146
 431 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 432 +
 433 +    invoke-virtual {v3}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 434 +
 435 +    move-result-object v1
 436 +
 437 +    .line 147
 438 +    .local v1, l:Landroid/view/ViewGroup$LayoutParams;
 439 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 440 +
 441 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mCircleSize:I
 442 +    invoke-static {v3}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$600(Lcom/android/systemui/statusbar/policy/CircleBattery;)I
 443 +
 444 +    move-result v3
 445 +
 446 +    iget-object v4, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 447 +
 448 +    invoke-virtual {v4}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getPaddingLeft()I
 449 +
 450 +    move-result v4
 451 +
 452 +    add-int/2addr v3, v4
 453 +
 454 +    iput v3, v1, Landroid/view/ViewGroup$LayoutParams;->width:I
 455 +
 456 +    .line 148
 457 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 458 +
 459 +    invoke-virtual {v3, v1}, Lcom/android/systemui/statusbar/policy/CircleBattery;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 460 +
 461 +    .line 150
 462 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 463 +
 464 +    invoke-virtual {v3}, Lcom/android/systemui/statusbar/policy/CircleBattery;->invalidate()V
 465 +
 466 +    .line 153
 467 +    .end local v1           #l:Landroid/view/ViewGroup$LayoutParams;
 468 +    .end local v2           #visibility:I
 469 +    :cond_1
 470 +    return-void
 471 +
 472 +    .line 140
 473 +    :cond_2
 474 +    const/16 v2, 0x8
 475 +
 476 +    goto :goto_0
 477 +.end method
 478 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery$SettingsObserver.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery$SettingsObserver.smali
 479 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery$SettingsObserver.smali
 480 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery$SettingsObserver.smali
 481 @@ -111,7 +111,7 @@
 482
 483      if-eq v0, v1, :cond_0
 484
 485 -    if-ne v0, v5, :cond_1
 486 +    if-ne v0, v5, :cond_3
 487
 488      :cond_0
 489      move v1, v3
 490 @@ -123,7 +123,7 @@
 491      .line 105
 492      iget-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 493
 494 -    if-ne v0, v5, :cond_2
 495 +    if-ne v0, v5, :cond_4
 496
 497      :goto_1
 498      #setter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mPercentage:Z
 499 @@ -132,22 +132,93 @@
 500      .line 107
 501      iget-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 502
 503 -    invoke-virtual {v1}, Lcom/android/systemui/statusbar/policy/CircleBattery;->updateVisibility()V
 504 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 505
 506 -    .line 108
 507 -    return-void
 508 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mActivated:Z
 509 +    invoke-static {v3}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$000(Lcom/android/systemui/statusbar/policy/CircleBattery;)Z
 510 +
 511 +    move-result v3
 512 +
 513 +    if-eqz v3, :cond_5
 514 +
 515 +    iget-object v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 516 +
 517 +    invoke-virtual {v3}, Lcom/android/systemui/statusbar/policy/CircleBattery;->isBatteryPresent()Z
 518 +
 519 +    move-result v3
 520 +
 521 +    if-eqz v3, :cond_5
 522 +
 523 +    :goto_2
 524 +    invoke-virtual {v1, v2}, Lcom/android/systemui/statusbar/policy/CircleBattery;->setVisibility(I)V
 525 +
 526 +    .line 117
 527 +    iget-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 528
 529 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryReceiver:Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 530 +    invoke-static {v1}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$400(Lcom/android/systemui/statusbar/policy/CircleBattery;)Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 531 +
 532 +    move-result-object v1
 533 +
 534 +    if-eqz v1, :cond_1
 535 +
 536 +    .line 118
 537 +    iget-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 538 +
 539 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryReceiver:Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 540 +    invoke-static {v1}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$400(Lcom/android/systemui/statusbar/policy/CircleBattery;)Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 541 +
 542 +    move-result-object v1
 543 +
 544 +    #calls: Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->updateRegistration()V
 545 +    invoke-static {v1}, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->access$500(Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;)V
 546 +
 547 +    .line 121
 548      :cond_1
 549 +    iget-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 550 +
 551 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mActivated:Z
 552 +    invoke-static {v1}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$000(Lcom/android/systemui/statusbar/policy/CircleBattery;)Z
 553 +
 554 +    move-result v1
 555 +
 556 +    if-eqz v1, :cond_2
 557 +
 558 +    iget-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 559 +
 560 +    #getter for: Lcom/android/systemui/statusbar/policy/CircleBattery;->mAttached:Z
 561 +    invoke-static {v1}, Lcom/android/systemui/statusbar/policy/CircleBattery;->access$100(Lcom/android/systemui/statusbar/policy/CircleBattery;)Z
 562 +
 563 +    move-result v1
 564 +
 565 +    if-eqz v1, :cond_2
 566 +
 567 +    .line 122
 568 +    iget-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->this$0:Lcom/android/systemui/statusbar/policy/CircleBattery;
 569 +
 570 +    invoke-virtual {v1}, Lcom/android/systemui/statusbar/policy/CircleBattery;->invalidate()V
 571 +
 572 +    .line 124
 573 +    :cond_2
 574 +    return-void
 575 +
 576 +    :cond_3
 577      move v1, v2
 578
 579      .line 103
 580      goto :goto_0
 581
 582 -    :cond_2
 583 +    :cond_4
 584      move v3, v2
 585
 586      .line 105
 587      goto :goto_1
 588 +
 589 +    .line 116
 590 +    :cond_5
 591 +    const/16 v2, 0x8
 592 +
 593 +    goto :goto_2
 594  .end method
 595
 596  .method public unobserve()V
 597 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery.smali
 598 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery.smali
 599 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleBattery.smali
 600 @@ -2,13 +2,11 @@
 601  .super Landroid/widget/ImageView;
 602  .source "CircleBattery.java"
 603
 604 -# interfaces
 605 -.implements Lcom/android/systemui/statusbar/policy/BatteryController$BatteryStateChangeCallback;
 606 -
 607
 608  # annotations
 609  .annotation system Ldalvik/annotation/MemberClasses;
 610      value = {
 611 +        Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;,
 612          Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;
 613      }
 614  .end annotation
 615 @@ -21,6 +19,10 @@
 616
 617  .field private mAttached:Z
 618
 619 +.field private mBatteryPlugged:Z
 620 +
 621 +.field private mBatteryReceiver:Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 622 +
 623  .field private mBatteryStatus:I
 624
 625  .field private mCircleSize:I
 626 @@ -53,8 +55,6 @@
 627
 628  .field private mTextY:Ljava/lang/Float;
 629
 630 -.field private mWarningLevel:I
 631 -
 632
 633  # direct methods
 634  .method public constructor <init>(Landroid/content/Context;)V
 635 @@ -100,7 +100,12 @@
 636      .line 123
 637      invoke-direct {p0, p1, p2, p3}, Landroid/widget/ImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 638
 639 -    .line 73
 640 +    .line 56
 641 +    const/4 v1, 0x0
 642 +
 643 +    iput-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryReceiver:Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 644 +
 645 +    .line 83
 646      new-instance v1, Lcom/android/systemui/statusbar/policy/CircleBattery$1;
 647
 648      invoke-direct {v1, p0}, Lcom/android/systemui/statusbar/policy/CircleBattery$1;-><init>(Lcom/android/systemui/statusbar/policy/CircleBattery;)V
 649 @@ -126,7 +131,16 @@
 650
 651      iput-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mObserver:Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;
 652
 653 -    .line 132
 654 +    .line 199
 655 +    new-instance v1, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 656 +
 657 +    iget-object v2, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mContext:Landroid/content/Context;
 658 +
 659 +    invoke-direct {v1, p0, v2}, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;-><init>(Lcom/android/systemui/statusbar/policy/CircleBattery;Landroid/content/Context;)V
 660 +
 661 +    iput-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryReceiver:Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 662 +
 663 +    .line 203
 664      invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getResources()Landroid/content/res/Resources;
 665
 666      move-result-object v0
 667 @@ -256,19 +270,6 @@
 668
 669      invoke-virtual {v1, v3}, Landroid/graphics/Paint;->setFakeBoldText(Z)V
 670
 671 -    .line 158
 672 -    invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 673 -
 674 -    move-result-object v1
 675 -
 676 -    const v2, 0x10e001a
 677 -
 678 -    invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getInteger(I)I
 679 -
 680 -    move-result v1
 681 -
 682 -    iput v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mWarningLevel:I
 683 -
 684      .line 159
 685      return-void
 686  .end method
 687 @@ -330,6 +331,28 @@
 688      return p1
 689  .end method
 690
 691 +.method static synthetic access$400(Lcom/android/systemui/statusbar/policy/CircleBattery;)Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 692 +    .locals 1
 693 +    .parameter "x0"
 694 +
 695 +    .prologue
 696 +    .line 53
 697 +    iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryReceiver:Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
 698 +
 699 +    return-object v0
 700 +.end method
 701 +
 702 +.method static synthetic access$600(Lcom/android/systemui/statusbar/policy/CircleBattery;)I
 703 +    .locals 1
 704 +    .parameter "x0"
 705 +
 706 +    .prologue
 707 +    .line 53
 708 +    iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mCircleSize:I
 709 +
 710 +    return v0
 711 +.end method
 712 +
 713  .method private initSizeBasedStuff()V
 714      .locals 11
 715
 716 @@ -586,25 +609,78 @@
 717      return-void
 718  .end method
 719
 720 +.method private isBatteryStatusCharging()Z
 721 +    .locals 2
 722 +
 723 +    .prologue
 724 +    .line 252
 725 +    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getBatteryStatus()I
 726 +
 727 +    move-result v0
 728 +
 729 +    const/4 v1, 0x2
 730 +
 731 +    if-ne v0, v1, :cond_0
 732 +
 733 +    const/4 v0, 0x1
 734 +
 735 +    :goto_0
 736 +    return v0
 737 +
 738 +    :cond_0
 739 +    const/4 v0, 0x0
 740 +
 741 +    goto :goto_0
 742 +.end method
 743 +
 744 +.method private isBatteryStatusUnknown()Z
 745 +    .locals 2
 746 +
 747 +    .prologue
 748 +    const/4 v0, 0x1
 749 +
 750 +    .line 248
 751 +    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getBatteryStatus()I
 752 +
 753 +    move-result v1
 754 +
 755 +    if-ne v1, v0, :cond_0
 756 +
 757 +    :goto_0
 758 +    return v0
 759 +
 760 +    :cond_0
 761 +    const/4 v0, 0x0
 762 +
 763 +    goto :goto_0
 764 +.end method
 765 +
 766  .method private updateChargeAnim()V
 767      .locals 4
 768
 769      .prologue
 770      const/4 v2, 0x0
 771
 772 -    .line 269
 773 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getBatteryStatus()I
 774 +    .line 351
 775 +    invoke-direct {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->isBatteryStatusCharging()Z
 776
 777      move-result v0
 778
 779 -    const/4 v1, 0x2
 780 +    if-eqz v0, :cond_0
 781 +
 782 +    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getLevel()I
 783 +
 784 +    move-result v0
 785 +
 786 +    const/16 v1, 0x61
 787
 788 -    if-eq v0, v1, :cond_1
 789 +    if-lt v0, v1, :cond_2
 790
 791 -    .line 270
 792 +    .line 352
 793 +    :cond_0
 794      iget-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mIsAnimating:Z
 795
 796 -    if-eqz v0, :cond_0
 797 +    if-eqz v0, :cond_1
 798
 799      .line 271
 800      iput-boolean v2, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mIsAnimating:Z
 801 @@ -619,13 +695,13 @@
 802
 803      invoke-virtual {v0, v1}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 804
 805 -    .line 288
 806 -    :cond_0
 807 +    .line 370
 808 +    :cond_1
 809      :goto_0
 810      return-void
 811
 812 -    .line 278
 813 -    :cond_1
 814 +    .line 360
 815 +    :cond_2
 816      const/4 v0, 0x1
 817
 818      iput-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mIsAnimating:Z
 819 @@ -635,7 +711,7 @@
 820
 821      const/16 v1, 0x168
 822
 823 -    if-le v0, v1, :cond_2
 824 +    if-le v0, v1, :cond_3
 825
 826      .line 281
 827      iput v2, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mAnimOffset:I
 828 @@ -659,8 +735,8 @@
 829
 830      goto :goto_0
 831
 832 -    .line 283
 833 -    :cond_2
 834 +    .line 365
 835 +    :cond_3
 836      iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mAnimOffset:I
 837
 838      add-int/lit8 v0, v0, 0x3
 839 @@ -673,7 +749,7 @@
 840
 841  # virtual methods
 842  .method protected drawCircle(Landroid/graphics/Canvas;IIFLandroid/graphics/RectF;)V
 843 -    .locals 8
 844 +    .locals 10
 845      .parameter "canvas"
 846      .parameter "level"
 847      .parameter "animOffset"
 848 @@ -681,35 +757,47 @@
 849      .parameter "drawRect"
 850
 851      .prologue
 852 -    const/4 v6, 0x1
 853 -
 854      const/4 v4, 0x0
 855
 856 -    .line 221
 857 -    iget-object v7, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mPaintSystem:Landroid/graphics/Paint;
 858 +    .line 297
 859 +    iget-object v9, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mPaintSystem:Landroid/graphics/Paint;
 860
 861 -    .line 222
 862 -    .local v7, usePaint:Landroid/graphics/Paint;
 863 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getBatteryStatus()I
 864 +    .line 298
 865 +    .local v9, usePaint:Landroid/graphics/Paint;
 866 +    move v6, p2
 867
 868 -    move-result v0
 869 +    .line 299
 870 +    .local v6, internalLevel:I
 871 +    invoke-direct {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->isBatteryStatusUnknown()Z
 872
 873 -    if-ne v0, v6, :cond_2
 874 +    move-result v8
 875
 876 -    .line 224
 877 -    .local v6, unknownStatus:Z
 878 -    :goto_0
 879 -    if-eqz v6, :cond_3
 880 +    .line 301
 881 +    .local v8, unknownStatus:Z
 882 +    if-eqz v8, :cond_3
 883
 884 -    .line 225
 885 -    iget-object v7, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mPaintGray:Landroid/graphics/Paint;
 886 +    .line 302
 887 +    iget-object v9, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mPaintGray:Landroid/graphics/Paint;
 888
 889 -    .line 226
 890 -    const/16 p2, 0x64
 891 +    .line 303
 892 +    const/16 v6, 0x64
 893
 894 -    .line 234
 895 +    .line 311
 896      :cond_0
 897 -    :goto_1
 898 +    :goto_0
 899 +    move v7, v6
 900 +
 901 +    .line 312
 902 +    .local v7, padLevel:I
 903 +    const/16 v0, 0x61
 904 +
 905 +    if-lt v7, v0, :cond_1
 906 +
 907 +    .line 313
 908 +    const/16 v7, 0x64
 909 +
 910 +    .line 317
 911 +    :cond_1
 912      const/high16 v2, 0x4387
 913
 914      const/high16 v3, 0x43b4
 915 @@ -729,7 +817,7 @@
 916
 917      const v0, 0x40666666
 918
 919 -    int-to-float v1, p2
 920 +    int-to-float v1, v7
 921
 922      mul-float v3, v0, v1
 923
 924 @@ -737,17 +825,17 @@
 925
 926      move-object v1, p5
 927
 928 -    move-object v5, v7
 929 +    move-object v5, v9
 930
 931      invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawArc(Landroid/graphics/RectF;FFZLandroid/graphics/Paint;)V
 932
 933 -    .line 239
 934 -    if-eqz v6, :cond_5
 935 +    .line 322
 936 +    if-eqz v8, :cond_4
 937
 938      .line 240
 939      iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mPaintFont:Landroid/graphics/Paint;
 940
 941 -    invoke-virtual {v7}, Landroid/graphics/Paint;->getColor()I
 942 +    invoke-virtual {v9}, Landroid/graphics/Paint;->getColor()I
 943
 944      move-result v1
 945
 946 @@ -766,66 +854,45 @@
 947
 948      invoke-virtual {p1, v0, p4, v1, v2}, Landroid/graphics/Canvas;->drawText(Ljava/lang/String;FFLandroid/graphics/Paint;)V
 949
 950 -    .line 247
 951 -    :cond_1
 952 -    :goto_2
 953 -    return-void
 954 -
 955 -    .end local v6           #unknownStatus:Z
 956 +    .line 330
 957      :cond_2
 958 -    move v6, v4
 959 -
 960 -    .line 222
 961 -    goto :goto_0
 962 +    :goto_1
 963 +    return-void
 964
 965 -    .line 227
 966 -    .restart local v6       #unknownStatus:Z
 967 +    .line 304
 968 +    .end local v7           #padLevel:I
 969      :cond_3
 970 -    iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mWarningLevel:I
 971 +    const/16 v0, 0xe
 972
 973 -    if-ge p2, v0, :cond_4
 974 +    if-gt v6, v0, :cond_0
 975
 976 -    .line 228
 977 -    iget-object v7, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mPaintRed:Landroid/graphics/Paint;
 978 +    .line 305
 979 +    iget-object v9, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mPaintRed:Landroid/graphics/Paint;
 980
 981 -    goto :goto_1
 982 +    goto :goto_0
 983
 984 -    .line 229
 985 +    .line 325
 986 +    .restart local v7       #padLevel:I
 987      :cond_4
 988 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getBatteryStatus()I
 989 -
 990 -    move-result v0
 991 -
 992 -    const/4 v1, 0x5
 993 -
 994 -    if-ne v0, v1, :cond_0
 995 -
 996 -    .line 230
 997 -    const/16 p2, 0x64
 998 -
 999 -    goto :goto_1
1000 -
1001 -    .line 242
1002 -    :cond_5
1003      const/16 v0, 0x64
1004
1005 -    if-ge p2, v0, :cond_1
1006 +    if-ge v6, v0, :cond_2
1007
1008      iget-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mPercentage:Z
1009
1010 -    if-eqz v0, :cond_1
1011 +    if-eqz v0, :cond_2
1012
1013      .line 243
1014      iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mPaintFont:Landroid/graphics/Paint;
1015
1016 -    invoke-virtual {v7}, Landroid/graphics/Paint;->getColor()I
1017 +    invoke-virtual {v9}, Landroid/graphics/Paint;->getColor()I
1018
1019      move-result v1
1020
1021      invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V
1022
1023 -    .line 244
1024 -    invoke-static {p2}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
1025 +    .line 327
1026 +    invoke-static {v6}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
1027
1028      move-result-object v0
1029
1030 @@ -839,25 +906,25 @@
1031
1032      invoke-virtual {p1, v0, p4, v1, v2}, Landroid/graphics/Canvas;->drawText(Ljava/lang/String;FFLandroid/graphics/Paint;)V
1033
1034 -    goto :goto_2
1035 +    goto :goto_1
1036  .end method
1037
1038 -.method protected getBatteryLevel()I
1039 +.method protected getBatteryStatus()I
1040      .locals 1
1041
1042      .prologue
1043 -    .line 209
1044 -    iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mLevel:I
1045 +    .line 235
1046 +    iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryStatus:I
1047
1048      return v0
1049  .end method
1050
1051 -.method protected getBatteryStatus()I
1052 +.method protected getLevel()I
1053      .locals 1
1054
1055      .prologue
1056 -    .line 213
1057 -    iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryStatus:I
1058 +    .line 231
1059 +    iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mLevel:I
1060
1061      return v0
1062  .end method
1063 @@ -894,7 +961,13 @@
1064
1065      invoke-virtual {v0}, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->observe()V
1066
1067 -    .line 167
1068 +    .line 268
1069 +    iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryReceiver:Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
1070 +
1071 +    #calls: Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->updateRegistration()V
1072 +    invoke-static {v0}, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->access$500(Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;)V
1073 +
1074 +    .line 269
1075      iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mHandler:Landroid/os/Handler;
1076
1077      iget-object v1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mInvalidate:Ljava/lang/Runnable;
1078 @@ -908,22 +981,48 @@
1079      return-void
1080  .end method
1081
1082 -.method public onBatteryLevelChanged(II)V
1083 -    .locals 0
1084 -    .parameter "level"
1085 -    .parameter "status"
1086 +.method protected onBatteryStatusChange(Landroid/content/Intent;)V
1087 +    .locals 3
1088 +    .parameter "intent"
1089
1090      .prologue
1091 -    .line 186
1092 -    iput p1, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mLevel:I
1093 +    const/4 v1, 0x1
1094 +
1095 +    const/4 v0, 0x0
1096 +
1097 +    .line 256
1098 +    const-string v2, "level"
1099 +
1100 +    invoke-virtual {p1, v2, v0}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
1101 +
1102 +    move-result v2
1103 +
1104 +    iput v2, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mLevel:I
1105 +
1106 +    .line 257
1107 +    const-string v2, "plugged"
1108
1109 -    .line 187
1110 -    iput p2, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryStatus:I
1111 +    invoke-virtual {p1, v2, v0}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
1112
1113 -    .line 188
1114 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->updateVisibility()V
1115 +    move-result v2
1116 +
1117 +    if-eqz v2, :cond_0
1118 +
1119 +    move v0, v1
1120 +
1121 +    :cond_0
1122 +    iput-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryPlugged:Z
1123 +
1124 +    .line 258
1125 +    const-string v0, "status"
1126
1127 -    .line 189
1128 +    invoke-virtual {p1, v0, v1}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
1129 +
1130 +    move-result v0
1131 +
1132 +    iput v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryStatus:I
1133 +
1134 +    .line 260
1135      return-void
1136  .end method
1137
1138 @@ -949,7 +1048,13 @@
1139
1140      invoke-virtual {v0}, Lcom/android/systemui/statusbar/policy/CircleBattery$SettingsObserver;->unobserve()V
1141
1142 -    .line 177
1143 +    .line 279
1144 +    iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mBatteryReceiver:Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;
1145 +
1146 +    #calls: Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->updateRegistration()V
1147 +    invoke-static {v0}, Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;->access$500(Lcom/android/systemui/statusbar/policy/CircleBattery$BatteryReceiver;)V
1148 +
1149 +    .line 280
1150      const/4 v0, 0x0
1151
1152      iput-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mRectLeft:Landroid/graphics/RectF;
1153 @@ -963,12 +1068,10 @@
1154  .end method
1155
1156  .method protected onDraw(Landroid/graphics/Canvas;)V
1157 -    .locals 7
1158 +    .locals 6
1159      .parameter "canvas"
1160
1161      .prologue
1162 -    const/4 v3, 0x0
1163 -
1164      .line 251
1165      iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mRectLeft:Landroid/graphics/RectF;
1166
1167 @@ -981,31 +1084,20 @@
1168      :cond_0
1169      invoke-direct {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->updateChargeAnim()V
1170
1171 -    .line 257
1172 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getBatteryStatus()I
1173 -
1174 -    move-result v0
1175 +    .line 340
1176 +    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getLevel()I
1177
1178 -    const/4 v1, 0x2
1179 +    move-result v2
1180
1181 -    if-ne v0, v1, :cond_2
1182 +    invoke-direct {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->isBatteryStatusCharging()Z
1183
1184 -    const/4 v6, 0x1
1185 +    move-result v0
1186
1187 -    .line 258
1188 -    .local v6, charging:Z
1189 -    :goto_0
1190 -    if-eqz v6, :cond_1
1191 +    if-eqz v0, :cond_1
1192
1193      iget v3, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mAnimOffset:I
1194
1195 -    .line 260
1196 -    .local v3, offset:I
1197 -    :cond_1
1198 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->getBatteryLevel()I
1199 -
1200 -    move-result v2
1201 -
1202 +    :goto_0
1203      iget-object v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mTextLeftX:Ljava/lang/Float;
1204
1205      invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
1206 @@ -1023,10 +1115,9 @@
1207      .line 261
1208      return-void
1209
1210 -    .end local v3           #offset:I
1211 -    .end local v6           #charging:Z
1212 -    :cond_2
1213 -    move v6, v3
1214 +    .line 340
1215 +    :cond_1
1216 +    const/4 v3, 0x0
1217
1218      .line 257
1219      goto :goto_0
1220 @@ -1063,46 +1154,3 @@
1221      .line 206
1222      return-void
1223  .end method
1224 -
1225 -.method protected updateVisibility()V
1226 -    .locals 1
1227 -
1228 -    .prologue
1229 -    .line 192
1230 -    iget-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mActivated:Z
1231 -
1232 -    if-eqz v0, :cond_1
1233 -
1234 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->isBatteryPresent()Z
1235 -
1236 -    move-result v0
1237 -
1238 -    if-eqz v0, :cond_1
1239 -
1240 -    const/4 v0, 0x0
1241 -
1242 -    :goto_0
1243 -    invoke-virtual {p0, v0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->setVisibility(I)V
1244 -
1245 -    .line 194
1246 -    iget-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mActivated:Z
1247 -
1248 -    if-eqz v0, :cond_0
1249 -
1250 -    iget-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleBattery;->mAttached:Z
1251 -
1252 -    if-eqz v0, :cond_0
1253 -
1254 -    .line 195
1255 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleBattery;->invalidate()V
1256 -
1257 -    .line 197
1258 -    :cond_0
1259 -    return-void
1260 -
1261 -    .line 192
1262 -    :cond_1
1263 -    const/16 v0, 0x8
1264 -
1265 -    goto :goto_0
1266 -.end method
1267 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleDockBattery.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleDockBattery.smali
1268 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleDockBattery.smali
1269 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/CircleDockBattery.smali
1270 @@ -2,13 +2,12 @@
1271  .super Lcom/android/systemui/statusbar/policy/CircleBattery;
1272  .source "CircleDockBattery.java"
1273
1274 -# interfaces
1275 -.implements Lcom/android/systemui/statusbar/policy/DockBatteryController$DockBatteryStateChangeCallback;
1276 -
1277
1278  # instance fields
1279  .field private mAttached:Z
1280
1281 +.field private mBatteryPlugged:Z
1282 +
1283  .field private mBatteryPresent:Z
1284
1285  .field private final mContext:Landroid/content/Context;
1286 @@ -53,12 +52,14 @@
1287  .end method
1288
1289  .method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
1290 -    .locals 1
1291 +    .locals 2
1292      .parameter "context"
1293      .parameter "attrs"
1294      .parameter "defStyle"
1295
1296      .prologue
1297 +    const/4 v1, 0x0
1298 +
1299      .line 62
1300      invoke-direct {p0, p1, p2, p3}, Lcom/android/systemui/statusbar/policy/CircleBattery;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
1301
1302 @@ -67,10 +68,11 @@
1303
1304      iput v0, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mDockBatteryStatus:I
1305
1306 -    .line 42
1307 -    const/4 v0, 0x0
1308 +    .line 41
1309 +    iput-boolean v1, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mBatteryPlugged:Z
1310
1311 -    iput-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mBatteryPresent:Z
1312 +    .line 42
1313 +    iput-boolean v1, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mBatteryPresent:Z
1314
1315      .line 63
1316      iput-object p1, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mContext:Landroid/content/Context;
1317 @@ -230,22 +232,22 @@
1318      return-void
1319  .end method
1320
1321 -.method protected getBatteryLevel()I
1322 +.method protected getBatteryStatus()I
1323      .locals 1
1324
1325      .prologue
1326 -    .line 106
1327 -    iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mLevel:I
1328 +    .line 103
1329 +    iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mDockBatteryStatus:I
1330
1331      return v0
1332  .end method
1333
1334 -.method protected getBatteryStatus()I
1335 +.method protected getLevel()I
1336      .locals 1
1337
1338      .prologue
1339 -    .line 111
1340 -    iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mDockBatteryStatus:I
1341 +    .line 98
1342 +    iget v0, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mLevel:I
1343
1344      return v0
1345  .end method
1346 @@ -319,6 +321,64 @@
1347      return-void
1348  .end method
1349
1350 +.method protected onBatteryStatusChange(Landroid/content/Intent;)V
1351 +    .locals 3
1352 +    .parameter "intent"
1353 +
1354 +    .prologue
1355 +    const/4 v0, 0x1
1356 +
1357 +    const/4 v1, 0x0
1358 +
1359 +    .line 118
1360 +    const-string v2, "dock_level"
1361 +
1362 +    invoke-virtual {p1, v2, v1}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
1363 +
1364 +    move-result v2
1365 +
1366 +    iput v2, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mLevel:I
1367 +
1368 +    .line 119
1369 +    const-string v2, "dock_status"
1370 +
1371 +    invoke-virtual {p1, v2, v0}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
1372 +
1373 +    move-result v2
1374 +
1375 +    iput v2, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mDockBatteryStatus:I
1376 +
1377 +    .line 122
1378 +    const-string v2, "dock_plugged"
1379 +
1380 +    invoke-virtual {p1, v2, v1}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
1381 +
1382 +    move-result v2
1383 +
1384 +    if-eqz v2, :cond_0
1385 +
1386 +    :goto_0
1387 +    iput-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mBatteryPlugged:Z
1388 +
1389 +    .line 123
1390 +    const-string v0, "dock_present"
1391 +
1392 +    invoke-virtual {p1, v0, v1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
1393 +
1394 +    move-result v0
1395 +
1396 +    iput-boolean v0, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mBatteryPresent:Z
1397 +
1398 +    .line 124
1399 +    return-void
1400 +
1401 +    :cond_0
1402 +    move v0, v1
1403 +
1404 +    .line 122
1405 +    goto :goto_0
1406 +.end method
1407 +
1408  .method protected onDetachedFromWindow()V
1409      .locals 2
1410
1411 @@ -353,26 +413,3 @@
1412      .line 94
1413      return-void
1414  .end method
1415 -
1416 -.method public onDockBatteryLevelChanged(IZI)V
1417 -    .locals 0
1418 -    .parameter "level"
1419 -    .parameter "present"
1420 -    .parameter "status"
1421 -
1422 -    .prologue
1423 -    .line 98
1424 -    iput p1, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mLevel:I
1425 -
1426 -    .line 99
1427 -    iput-boolean p2, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mBatteryPresent:Z
1428 -
1429 -    .line 100
1430 -    iput p3, p0, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->mDockBatteryStatus:I
1431 -
1432 -    .line 101
1433 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/CircleDockBattery;->updateVisibility()V
1434 -
1435 -    .line 102
1436 -    return-void
1437 -.end method
1438 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DockBatteryController$DockBatteryStateChangeCallback.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DockBatteryController$DockBatteryStateChangeCallback.smali
1439 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DockBatteryController$DockBatteryStateChangeCallback.smali
1440 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DockBatteryController$DockBatteryStateChangeCallback.smali
1441 @@ -15,5 +15,5 @@
1442
1443
1444  # virtual methods
1445 -.method public abstract onDockBatteryLevelChanged(IZI)V
1446 +.method public abstract onDockBatteryLevelChanged(IZZ)V
1447  .end method
1448 diff -Npru stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DockBatteryController.smali tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DockBatteryController.smali
1449 --- stock-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DockBatteryController.smali
1450 +++ tablet-SystemUI/SystemUI.out/smali/com/android/systemui/statusbar/policy/DockBatteryController.smali
1451 @@ -104,11 +104,11 @@
1452
1453      move-result v1
1454
1455 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/DockBatteryController;->getBatteryStatus()I
1456 +    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/DockBatteryController;->isBatteryStatusCharging()Z
1457
1458      move-result v2
1459
1460 -    invoke-interface {p1, v0, v1, v2}, Lcom/android/systemui/statusbar/policy/DockBatteryController$DockBatteryStateChangeCallback;->onDockBatteryLevelChanged(IZI)V
1461 +    invoke-interface {p1, v0, v1, v2}, Lcom/android/systemui/statusbar/policy/DockBatteryController$DockBatteryStateChangeCallback;->onDockBatteryLevelChanged(IZZ)V
1462
1463      .line 80
1464      return-void
1465 @@ -335,11 +335,11 @@
1466
1467      move-result v3
1468
1469 -    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/DockBatteryController;->getBatteryStatus()I
1470 +    invoke-virtual {p0}, Lcom/android/systemui/statusbar/policy/DockBatteryController;->isBatteryStatusCharging()Z
1471
1472      move-result v4
1473
1474 -    invoke-interface {v0, v2, v3, v4}, Lcom/android/systemui/statusbar/policy/DockBatteryController$DockBatteryStateChangeCallback;->onDockBatteryLevelChanged(IZI)V
1475 +    invoke-interface {v0, v2, v3, v4}, Lcom/android/systemui/statusbar/policy/DockBatteryController$DockBatteryStateChangeCallback;->onDockBatteryLevelChanged(IZZ)V
1476
1477      goto :goto_0
1478
1479 diff -Npru stock-SystemUI/SystemUI.out/res/layout-sw600dp/status_bar_search_panel.xml tablet-SystemUI/SystemUI.out/res/layout-sw600dp/status_bar_search_panel.xml
1480 --- stock-SystemUI/SystemUI.out/res/layout-sw600dp/status_bar_search_panel.xml
1481 +++ tablet-SystemUI/SystemUI.out/res/layout-sw600dp/status_bar_search_panel.xml
1482 @@ -2,5 +2,5 @@
1483  <com.android.systemui.SearchPanelView android:id="@id/search_panel_container" android:layout_width="fill_parent" android:layout_height="fill_parent"
1484    xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android"
1485    xmlns:android="http://schemas.android.com/apk/res/android">
1486 -    <com.android.internal.widget.multiwaveview.GlowPadView android:gravity="top|center" android:layout_gravity="bottom|center" android:id="@id/glow_pad_view" android:layout_width="wrap_content" android:layout_height="@dimen/navbar_search_panel_height" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:targetDescriptions="@array/navbar_search_target_descriptions" prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" prvandroid:outerRingDrawable="@drawable/navbar_search_outerring" prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" prvandroid:targetDrawables="@array/navbar_search_targets" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:feedbackCount="0" prvandroid:alwaysTrackFinger="true" />
1487 +    <com.android.internal.widget.multiwaveview.GlowPadView android:gravity="top|center" android:layout_gravity="bottom|left|center" android:id="@id/glow_pad_view" android:layout_width="wrap_content" android:layout_height="@dimen/navbar_search_panel_height" android:layout_marginLeft="-150.0dip" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:targetDescriptions="@array/navbar_search_target_descriptions" prvandroid:directionDescriptions="@array/navbar_search_direction_descriptions" prvandroid:outerRingDrawable="@drawable/navbar_search_outerring" prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" prvandroid:targetDrawables="@array/navbar_search_targets" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:feedbackCount="0" prvandroid:alwaysTrackFinger="true" />
1488  </com.android.systemui.SearchPanelView>
1489
1490 diff -Npru stock-SystemUI/SystemUI.out/res/values-sw720dp/dimens.xml tablet-SystemUI/SystemUI.out/res/values-sw720dp/dimens.xml
1491 --- stock-SystemUI/SystemUI.out/res/values-sw720dp/dimens.xml
1492 +++ tablet-SystemUI/SystemUI.out/res/values-sw720dp/dimens.xml
1493 @@ -16,7 +16,7 @@
1494      <dimen name="status_bar_recents_app_icon_top_margin">8.0dip</dimen>
1495      <dimen name="status_bar_icon_padding">1.0dip</dimen>
1496      <dimen name="notification_panel_width">512.0dip</dimen>
1497 -    <dimen name="system_bar_icon_drawing_size">24.0dip</dimen>
1498 +    <dimen name="system_bar_icon_drawing_size">22.0dip</dimen>
1499      <item type="dimen" name="system_bar_icon_drawing_alpha">100.0%</item>
1500      <dimen name="system_bar_navigation_key_width">80.0dip</dimen>
1501      <dimen name="system_bar_navigation_menu_key_width">80.0dip</dimen>
1502 @@ -22,7 +22,7 @@
1503      <dimen name="system_bar_navigation_menu_key_width">80.0dip</dimen>
1504      <dimen name="notification_ticker_width">360.0dip</dimen>
1505      <dimen name="status_bar_panel_bottom_offset">36.0dip</dimen>
1506 -    <dimen name="notification_panel_min_height">770.0dip</dimen>
1507 +    <dimen name="notification_panel_min_height">420.0dip</dimen>
1508      <dimen name="panel_float">56.0dip</dimen>
1509      <dimen name="status_bar_recents_width">600.0dip</dimen>
1510  </resources>
1511
1512 diff -Npru stock-SystemUI/SystemUI.out/res/values/dimens.xml tablet-SystemUI/SystemUI.out/res/values/dimens.xml
1513 --- stock-SystemUI/SystemUI.out/res/values/dimens.xml
1514 +++ tablet-SystemUI/SystemUI.out/res/values/dimens.xml
1515 @@ -28,8 +28,8 @@
1516      <dimen name="notification_max_height">256.0dip</dimen>
1517      <dimen name="notification_row_min_height">70.0dip</dimen>
1518      <dimen name="notification_row_max_height">260.0dip</dimen>
1519 -    <dimen name="status_bar_icon_drawing_size">18.0dip</dimen>
1520 -    <item type="dimen" name="status_bar_icon_drawing_alpha">65.0%</item>
1521 +    <dimen name="status_bar_icon_drawing_size">22.0dip</dimen>
1522 +    <item type="dimen" name="status_bar_icon_drawing_alpha">75.0%</item>
1523      <dimen name="status_bar_icon_padding">0.0dip</dimen>
1524      <dimen name="notification_divider_height">3.0dip</dimen>
1525      <dimen name="self_expand_velocity">2000.0dip</dimen>
1526
1527 diff -Npru stock-SystemUI/SystemUI.out/res/values/styles.xml tablet-SystemUI/SystemUI.out/res/values/styles.xml
1528 --- stock-SystemUI/SystemUI.out/res/values/styles.xml
1529 +++ tablet-SystemUI/SystemUI.out/res/values/styles.xml
1530 @@ -32,7 +32,7 @@
1531          <item name="android:textColor">@*android:color/holo_blue_light</item>
1532      </style>
1533      <style name="TextAppearance.StatusBar.Clock" parent="@*android:style/TextAppearance.StatusBar.Icon">
1534 -        <item name="android:textSize">16.0dip</item>
1535 +        <item name="android:textSize">24.0dip</item>
1536          <item name="android:textStyle">normal</item>
1537          <item name="android:textColor">@*android:color/holo_blue_light</item>
1538      </style>
1539 @@ -43,13 +43,13 @@
1540      </style>
1541      <style name="TextAppearance.StatusBar.Expanded" parent="@*android:style/TextAppearance.StatusBar" />
1542      <style name="TextAppearance.StatusBar.Expanded.Clock" parent="@style/TextAppearance.StatusBar.Expanded">
1543 -        <item name="android:textSize">32.0dip</item>
1544 +        <item name="android:textSize">42.0dip</item>
1545          <item name="android:textStyle">normal</item>
1546          <item name="android:textColor">@color/clock_view_color</item>
1547          <item name="android:fontFamily">sans-serif-light</item>
1548      </style>
1549      <style name="TextAppearance.StatusBar.Expanded.Date" parent="@style/TextAppearance.StatusBar.Expanded">
1550 -        <item name="android:textSize">12.0dip</item>
1551 +        <item name="android:textSize">28.0dip</item>
1552          <item name="android:textStyle">normal</item>
1553          <item name="android:textColor">@color/date_view_color</item>
1554          <item name="android:textAllCaps">true</item>
1555 @@ -112,7 +112,7 @@
1556          <item name="android:windowExitAnimation">@anim/priority_alert_exit</item>
1557      </style>
1558      <style name="TextAppearance.StatusBar.PhoneTicker" parent="@*android:style/TextAppearance.StatusBar.Ticker">
1559 -        <item name="android:textSize">14.0dip</item>
1560 +        <item name="android:textSize">16.0dip</item>
1561      </style>
1562      <style name="ClingButton">
1563          <item name="android:textStyle">bold</item>
1564 diff -Npru stock-SystemUI/SystemUI.out/res/layout/status_bar_recent_item.xml tablet-SystemUI/SystemUI.out/res/layout/status_bar_recent_item.xml
1565 --- stock-SystemUI/SystemUI.out/res/layout/status_bar_recent_item.xml   2013-04-21 10:43:15.583419883 -0400
1566 +++ tablet-SystemUI/SystemUI.out/res/layout/status_bar_recent_item.xml  2013-04-21 10:53:47.522553509 -0400
1567 @@ -1,7 +1,7 @@
1568  <?xml version="1.0" encoding="utf-8"?>
1569  <FrameLayout android:paddingTop="@dimen/status_bar_recents_item_padding" android:paddingBottom="@dimen/status_bar_recents_item_padding" android:clipChildren="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:importantForAccessibility="no"
1570    xmlns:android="http://schemas.android.com/apk/res/android">
1571 -    <RelativeLayout android:layout_gravity="center_horizontal" android:id="@id/recent_item" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content">
1572 +    <RelativeLayout android:layout_gravity="center_vertical" android:id="@id/recent_item" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content">
1573          <TextView android:textSize="@dimen/status_bar_recents_app_label_text_size" android:textColor="@color/status_bar_recents_app_label_color" android:ellipsize="marquee" android:id="@id/app_label" android:paddingTop="2.0dip" android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" android:layout_width="@dimen/status_bar_recents_app_label_width" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" android:scrollHorizontally="true" android:singleLine="true" android:layout_alignTop="@id/app_icon" android:layout_alignParentLeft="true" android:importantForAccessibility="no" />
1574          <FrameLayout android:id="@id/app_thumbnail" android:background="@drawable/recents_thumbnail_bg" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin" android:foreground="@drawable/recents_thumbnail_fg" android:layout_toRightOf="@id/app_label" android:layout_alignParentTop="true">
1575              <ImageView android:id="@id/app_thumbnail_image" android:layout_width="@dimen/status_bar_recents_thumbnail_width" android:layout_height="@dimen/status_bar_recents_thumbnail_height" />
1576 diff -Npru stock-SystemUI/SystemUI.out/res/layout/status_bar_recent_panel.xml tablet-SystemUI/SystemUI.out/res/layout/status_bar_recent_panel.xml
1577 --- stock-SystemUI/SystemUI.out/res/layout/status_bar_recent_panel.xml  2013-04-21 10:43:14.167412861 -0400
1578 +++ tablet-SystemUI/SystemUI.out/res/layout/status_bar_recent_panel.xml 2013-04-21 12:36:54.720419195 -0400
1579 @@ -3,10 +3,10 @@
1580    xmlns:android="http://schemas.android.com/apk/res/android"
1581    xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui">
1582      <FrameLayout android:id="@id/recents_bg_protect" android:background="@drawable/status_bar_recents_background" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_alignParentBottom="true">
1583 -        <com.android.systemui.recent.RecentsVerticalScrollView android:layout_gravity="bottom|left|center" android:id="@id/recents_container" android:scrollbars="none" android:fadingEdge="vertical" android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length" android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginRight="0.0dip" android:stackFromBottom="true" android:divider="@null">
1584 +        <com.android.systemui.recent.RecentsVerticalScrollView android:layout_gravity="bottom|left" android:id="@id/recents_container" android:scrollbars="none" android:fadingEdge="vertical" android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length" android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginRight="0.0dip" android:stackFromBottom="true" android:divider="@null">
1585              <LinearLayout android:orientation="vertical" android:id="@id/recents_linear_layout" android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" />
1586          </com.android.systemui.recent.RecentsVerticalScrollView>
1587 -        <ImageView android:layout_gravity="top|right|center" android:id="@id/recents_clear" android:clickable="true" android:layout_width="50.0dip" android:layout_height="50.0dip" android:src="@drawable/ic_recents_clear" android:scaleType="center" />
1588 +        <ImageView android:layout_gravity="bottom|right|center" android:id="@id/recents_clear" android:clickable="true" android:layout_width="50.0dip" android:layout_height="50.0dip" android:src="@drawable/ic_recents_clear" android:scaleType="center" />
1589      </FrameLayout>
1590      <include android:id="@id/recents_no_apps" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="fill_parent" layout="@layout/status_bar_no_recent_apps" />
1591      <RelativeLayout android:gravity="bottom" android:layout_gravity="bottom" android:id="@id/recents_ram_bar" android:layout_width="fill_parent" android:layout_height="wrap_content">
1592 diff -Npru stock-SystemUI/SystemUI.out/res/layout-land/status_bar_recent_item.xml tablet-SystemUI/SystemUI.out/res/layout-land/status_bar_recent_item.xml
1593 --- stock-SystemUI/SystemUI.out/res/layout-land/status_bar_recent_item.xml      2013-04-21 10:43:14.815416075 -0400
1594 +++ tablet-SystemUI/SystemUI.out/res/layout-land/status_bar_recent_item.xml     2013-04-21 10:53:58.298606903 -0400
1595 @@ -1,12 +1,13 @@
1596  <?xml version="1.0" encoding="utf-8"?>
1597 -<FrameLayout android:paddingLeft="@dimen/status_bar_recents_item_padding" android:paddingRight="@dimen/status_bar_recents_item_padding" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="fill_parent" android:importantForAccessibility="no"
1598 +<FrameLayout android:paddingTop="@dimen/status_bar_recents_item_padding" android:paddingBottom="@dimen/status_bar_recents_item_padding" android:clipChildren="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:importantForAccessibility="no"
1599    xmlns:android="http://schemas.android.com/apk/res/android">
1600 -    <RelativeLayout android:layout_gravity="center_vertical" android:id="@id/recent_item" android:paddingTop="@*android:dimen/status_bar_height" android:clipChildren="false" android:clipToPadding="false" android:layout_width="wrap_content" android:layout_height="wrap_content">
1601 -        <FrameLayout android:id="@id/app_thumbnail" android:background="@drawable/recents_thumbnail_bg" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin" android:layout_marginTop="@dimen/status_bar_recents_thumbnail_top_margin" android:foreground="@drawable/recents_thumbnail_fg" android:layout_alignParentLeft="true" android:layout_alignParentTop="true">
1602 +    <RelativeLayout android:layout_gravity="center_vertical" android:id="@id/recent_item" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content">
1603 +        <TextView android:textSize="@dimen/status_bar_recents_app_label_text_size" android:textColor="@color/status_bar_recents_app_label_color" android:ellipsize="marquee" android:id="@id/app_label" android:paddingTop="2.0dip" android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" android:layout_width="@dimen/status_bar_recents_app_label_width" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" android:scrollHorizontally="true" android:singleLine="true" android:layout_alignTop="@id/app_icon" android:layout_alignParentLeft="true" android:importantForAccessibility="no" />
1604 +        <FrameLayout android:id="@id/app_thumbnail" android:background="@drawable/recents_thumbnail_bg" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin" android:foreground="@drawable/recents_thumbnail_fg" android:layout_toRightOf="@id/app_label" android:layout_alignParentTop="true">
1605              <ImageView android:id="@id/app_thumbnail_image" android:layout_width="@dimen/status_bar_recents_thumbnail_width" android:layout_height="@dimen/status_bar_recents_thumbnail_height" />
1606          </FrameLayout>
1607 -        <ImageView android:id="@id/app_icon" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" android:scaleType="centerInside" android:adjustViewBounds="true" android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" />
1608 -        <TextView android:textSize="@dimen/status_bar_recents_app_label_text_size" android:textColor="@color/status_bar_recents_app_label_color" android:ellipsize="marquee" android:id="@id/app_label" android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" android:layout_width="@dimen/status_bar_recents_app_label_width" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" android:layout_marginTop="@dimen/status_bar_recents_text_description_padding" android:scrollHorizontally="true" android:singleLine="true" android:layout_below="@id/app_thumbnail" android:layout_alignLeft="@id/app_thumbnail" android:importantForAccessibility="no" />
1609 -        <TextView android:textSize="@dimen/status_bar_recents_app_description_text_size" android:ellipsize="marquee" android:id="@id/app_description" android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" android:layout_width="@dimen/status_bar_recents_app_label_width" android:layout_height="wrap_content" android:layout_marginTop="@dimen/status_bar_recents_text_description_padding" android:scrollHorizontally="true" android:singleLine="true" android:layout_below="@id/app_label" android:layout_alignLeft="@id/app_thumbnail" />
1610 +        <View android:id="@id/recents_callout_line" android:background="@drawable/recents_callout_line" android:layout_width="@dimen/status_bar_recents_app_label_width" android:layout_height="1.0dip" android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" android:layout_marginTop="3.0dip" android:layout_marginRight="3.0dip" android:layout_toLeftOf="@id/app_thumbnail" android:layout_below="@id/app_label" android:layout_alignParentLeft="true" />
1611 +        <ImageView android:id="@id/app_icon" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" android:scaleType="centerInside" android:adjustViewBounds="true" android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" android:layout_toRightOf="@id/app_label" />
1612 +        <TextView android:textSize="@dimen/status_bar_recents_app_description_text_size" android:ellipsize="marquee" android:id="@id/app_description" android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" android:layout_width="@dimen/status_bar_recents_app_label_width" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" android:layout_marginTop="3.0dip" android:scrollHorizontally="true" android:singleLine="true" android:layout_below="@id/recents_callout_line" android:layout_alignParentLeft="true" />
1613      </RelativeLayout>
1614  </FrameLayout>
1615 \ No newline at end of file
1616 diff -Npru stock-SystemUI/SystemUI.out/res/layout-land/status_bar_recent_panel.xml tablet-SystemUI/SystemUI.out/res/layout-land/status_bar_recent_panel.xml
1617 --- stock-SystemUI/SystemUI.out/res/layout-land/status_bar_recent_panel.xml     2013-04-21 10:43:14.951416757 -0400
1618 +++ tablet-SystemUI/SystemUI.out/res/layout-land/status_bar_recent_panel.xml    2013-04-21 12:36:57.248431710 -0400
1619 @@ -2,11 +2,11 @@
1620  <com.android.systemui.recent.RecentsPanelView android:id="@id/recents_root" android:layout_width="fill_parent" android:layout_height="fill_parent" systemui:recentItemLayout="@layout/status_bar_recent_item"
1621    xmlns:android="http://schemas.android.com/apk/res/android"
1622    xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui">
1623 -    <FrameLayout android:id="@id/recents_bg_protect" android:background="@drawable/status_bar_recents_background" android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_alignParentBottom="true">
1624 -        <com.android.systemui.recent.RecentsHorizontalScrollView android:layout_gravity="right" android:id="@id/recents_container" android:scrollbars="none" android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length" android:layout_width="wrap_content" android:layout_height="fill_parent">
1625 -            <LinearLayout android:orientation="horizontal" android:id="@id/recents_linear_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" />
1626 -        </com.android.systemui.recent.RecentsHorizontalScrollView>
1627 -        <ImageView android:layout_gravity="top|right|center" android:id="@id/recents_clear" android:clickable="true" android:layout_width="50.0dip" android:layout_height="50.0dip" android:src="@drawable/ic_recents_clear" android:scaleType="center" />
1628 +    <FrameLayout android:id="@id/recents_bg_protect" android:background="@drawable/status_bar_recents_background" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_alignParentBottom="true">
1629 +        <com.android.systemui.recent.RecentsVerticalScrollView android:layout_gravity="bottom|left" android:id="@id/recents_container" android:scrollbars="none" android:fadingEdge="vertical" android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length" android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginRight="0.0dip" android:stackFromBottom="true" android:divider="@null">
1630 +            <LinearLayout android:orientation="vertical" android:id="@id/recents_linear_layout" android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" />
1631 +        </com.android.systemui.recent.RecentsVerticalScrollView>
1632 +        <ImageView android:layout_gravity="bottom|right|center" android:id="@id/recents_clear" android:clickable="true" android:layout_width="50.0dip" android:layout_height="50.0dip" android:src="@drawable/ic_recents_clear" android:scaleType="center" />
1633      </FrameLayout>
1634      <include android:id="@id/recents_no_apps" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="fill_parent" layout="@layout/status_bar_no_recent_apps" />
1635      <RelativeLayout android:gravity="bottom" android:layout_gravity="bottom" android:id="@id/recents_ram_bar" android:layout_width="fill_parent" android:layout_height="fill_parent">