commit f4f0840f1d12d6f28236b876281c49e69e62b094
author Daniel Sandler <dsandler@android.com> Thu Oct 18 10:30:30 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 18 10:30:30 2012 -0700
tree 5a41e97a85779e8878b7f24d072d4241cd5720e9
parent b2ee13e40ec5c2b60ba9611154aedbf7b8f24393
parent 6f25a33b6ee8084c831f93a33a7a50c91f53c45e

am 6f25a33b: am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev

* commit '6f25a33b6ee8084c831f93a33a7a50c91f53c45e':
  Fix glitch when using settings pulldown then switching to notifications.

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 27a4db5..1c4dff8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1487,6 +1487,7 @@
         mFlipSettingsView.setVisibility(View.VISIBLE);
         mSettingsButton.setVisibility(View.GONE);
         mScrollView.setVisibility(View.GONE);
+        mScrollView.setScaleX(0f);
         mNotificationButton.setVisibility(View.VISIBLE);
         mNotificationButton.setAlpha(1f);
         mClearButton.setVisibility(View.GONE);