From 14f190e1252006711044ebb3cafa1345e2852d30 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Thu, 25 Mar 2010 09:45:53 -0400
Subject: [PATCH 1/2] Put the wifi status icon in the right place.

This fixes the inconsistency where all network-related icons appear on
the right side of the volume/vibrate icon except for the wifi icon,
which appears on the left.

Thanks to Kevin Purdy @ Lifehacker for kicking my OCD in :)
---
 core/res/res/values/arrays.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index 66f0e820cb382..e801ba8682423 100644
--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -113,11 +113,11 @@
         <item><xliff:g id="id">phone_evdo_signal</xliff:g></item>
         <item><xliff:g id="id">data_connection</xliff:g></item>
         <item><xliff:g id="id">cdma_eri</xliff:g></item>
+        <item><xliff:g id="id">wifi</xliff:g></item>
         <item><xliff:g id="id">tty</xliff:g></item>
         <item><xliff:g id="id">volume</xliff:g></item>
         <item><xliff:g id="id">mute</xliff:g></item>
         <item><xliff:g id="id">speakerphone</xliff:g></item>
-        <item><xliff:g id="id">wifi</xliff:g></item>
         <item><xliff:g id="id">tty</xliff:g></item>
         <item><xliff:g id="id">bluetooth</xliff:g></item>
         <item><xliff:g id="id">gps</xliff:g></item>

From 6c3da7fbc21fa8978c6f7b703ec87874d53ec760 Mon Sep 17 00:00:00 2001
From: Johan Alfven <johan.alfven@sonyericsson.com>
Date: Wed, 12 May 2010 09:00:28 +0200
Subject: [PATCH 2/2] Corrected debug message in WindowManager

When WindowManager reports "Key dispatching timed out"
it prints out information about the window state that was
present at the time the key was sent to that window.
There is a minor error in the class representing the
recorded window state so that the currently focused window
is printed instead of the recorded focused window.

Change-Id: I29a5471ef725e30f812ffd57fd4597ce81c0c7f2
---
 services/java/com/android/server/WindowManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 2bcf4cd02acb6..b90b03bea7032 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -5478,7 +5478,7 @@ public class WindowManagerService extends IWindowManager.Stub
                         + " fin=" + finished + " gfw=" + gotFirstWindow
                         + " ed=" + eventDispatching + " tts=" + timeToSwitch
                         + " wf=" + wasFrozen + " fp=" + focusPaused
-                        + " mcf=" + mCurrentFocus + "}}";
+                        + " mcf=" + curFocus + "}}";
             }
         };
         private DispatchState mDispatchState = null;