Merge "Hide the expanded status bar view when not in use." into jb-dev

Author: dsandler

packages/SystemUI/res/layout-sw600dp/super_status_bar.xml

@@ -35,6 +35,7 @@
         android:layout_width="@dimen/notification_panel_width"
         android:layout_height="match_parent"
         android:layout_gravity="center_horizontal|top"
+        android:visibility="invisible"
         />
 
 </com.android.systemui.statusbar.phone.StatusBarWindowView>

packages/SystemUI/res/layout/super_status_bar.xml

@@ -34,6 +34,7 @@
     <include layout="@layout/status_bar_expanded"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:visibility="invisible"
         />
 
 </com.android.systemui.statusbar.phone.StatusBarWindowView>

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

@@ -996,6 +996,7 @@ private void makeExpandedVisible() {
         }
 
         mExpandedVisible = true;
+        mNotificationPanel.setVisibility(View.VISIBLE);
 
         updateExpandedViewPos(EXPANDED_LEAVE_ALONE);
 
@@ -1089,7 +1090,7 @@ void performCollapse() {
         }
         mExpandedVisible = false;
         visibilityChanged(false);
-        //mNotificationPanel.setVisibility(View.GONE);
+        mNotificationPanel.setVisibility(View.INVISIBLE);
 
         // Shrink the window to the size of the status bar only
         WindowManager.LayoutParams lp = (WindowManager.LayoutParams) mStatusBarWindow.getLayoutParams();