Merge "Really hide the settings button on tablets." into jb-mr1-dev

Author: dsandler

packages/SystemUI/res/layout/status_bar_expanded_header.xml

@@ -77,16 +77,16 @@
     <ImageView android:id="@+id/clear_all_button"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_marginRight="12dp"
         android:scaleType="center"
         android:src="@drawable/ic_notify_clear"
         android:background="@drawable/ic_notify_button_bg"
         android:contentDescription="@string/accessibility_clear_all"
         />     
 
-    <FrameLayout
+    <FrameLayout android:id="@+id/settings_button_holder"
         android:layout_width="50dp"
         android:layout_height="50dp"
+        android:layout_marginLeft="12dp"
         >
         <ImageView android:id="@+id/settings_button"
             android:layout_width="50dp"

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

@@ -452,7 +452,11 @@ public boolean onTouch(View v, MotionEvent event) {
                     mSettingsButton.setVisibility(View.VISIBLE);
                 } else {
                     // there is a settings panel, but it's on the other side of the (large) screen
-                    mSettingsButton.setVisibility(View.GONE);
+                    final View buttonHolder = mStatusBarWindow.findViewById(
+                            R.id.settings_button_holder);
+                    if (buttonHolder != null) {
+                        buttonHolder.setVisibility(View.GONE);
+                    }
                 }
             } else {
                 // no settings panel, go straight to settings