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

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

Author: dsandler

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

@@ -1487,6 +1487,7 @@ public void switchToSettings() {
         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);