diff --git a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
index e7366c2a72d6c..ead1348612fb1 100644
--- a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
+++ b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -203,6 +203,11 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
 
     private boolean mKeyboardOpen = false;
 
+    /**
+     * we send this intent when the keyguard is dismissed.
+     */
+    private Intent mUserPresentIntent;
+
     /**
      * {@link #setKeyguardEnabled} waits on this condition when it reenables
      * the keyguard.
@@ -248,6 +253,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
                 context, WindowManagerImpl.getDefault(), this,
                 mKeyguardViewProperties, mUpdateMonitor);
 
+        mUserPresentIntent = new Intent(Intent.ACTION_USER_PRESENT);
     }
 
     /**
@@ -772,6 +778,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
         handleHide();
         mPM.userActivity(SystemClock.uptimeMillis(), true);
         mWakeLock.release();
+        mContext.sendBroadcast(mUserPresentIntent);
     }
 
     /**
diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index 8ecb2b671a610..5bbd5e9208687 100644
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -140,8 +140,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
 
     // Vibrator pattern for haptic feedback of a long press.
     private static final long[] LONG_PRESS_VIBE_PATTERN = {0, 1, 20, 21};
-    // Vibrator pattern for haptic feedback of a zoom ring tick
-    private static final long[] ZOOM_RING_TICK_VIBE_PATTERN = {0, 10};
     
     Context mContext;
     IWindowManager mWindowManager;
@@ -1223,6 +1221,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     /** {@inheritDoc} */
     public boolean finishAnimationLw() {
         boolean changed = false;
+        boolean hiding = false;
         if (mStatusBar != null) {
             //Log.i(TAG, "force=" + mForceStatusBar
             //        + " top=" + mTopFullscreenOpaqueWindowState);
@@ -1238,11 +1237,24 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                     (lp.flags & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0;
                 if (hideStatusBar) {
                     changed |= mStatusBar.hideLw(true);
+                    hiding = true;
                 } else {
                     changed |= mStatusBar.showLw(true);
                 }
             }
         }
+        
+        if (changed && hiding) {
+            IStatusBar sbs = IStatusBar.Stub.asInterface(ServiceManager.getService("statusbar"));
+            if (sbs != null) {
+                try {
+                    // Make sure the window shade is hidden.
+                    sbs.deactivate();
+                } catch (RemoteException e) {
+                }
+            }
+        }
+        
         return changed;
     }
 
@@ -1782,8 +1794,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             case HapticFeedbackConstants.LONG_PRESS:
                 mVibrator.vibrate(LONG_PRESS_VIBE_PATTERN, -1);
                 return true;
-            case HapticFeedbackConstants.ZOOM_RING_TICK:
-                mVibrator.vibrate(ZOOM_RING_TICK_VIBE_PATTERN, -1);
         }
         return false;
     }