From 2993f18b068f2b1ea8d4c7779aad86a18650a409 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Thu, 25 Nov 2010 13:29:55 +0900
Subject: Make the size of "shirt pocket" 0 when the icon of "shirt pocket" is
 invisible

bug: 3230503

Change-Id: I1028a92b6ce048c39af1e89845576198132b3176
---
 packages/SystemUI/res/layout-xlarge/status_bar.xml             | 10 +++++-----
 .../src/com/android/systemui/statusbar/tablet/ShirtPocket.java |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml
index 758377b..666bfdc 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml
@@ -158,10 +158,8 @@
                 />
             <com.android.systemui.statusbar.tablet.ShirtPocket
                 android:id="@+id/pocket"
-                android:layout_width="96dip"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:paddingLeft="18dip"
-                android:paddingRight="18dip"
                 android:animateLayoutChanges="true"
                 android:clickable="true"
                 android:descendantFocusability="blocksDescendants"
@@ -170,10 +168,12 @@
                 <ImageView 
                     android:id="@+id/pocket_icon"
                     android:src="@drawable/ic_sysbar_pocket"
-                    android:visibility="invisible"
-                    android:layout_width="match_parent"
+                    android:paddingLeft="18dip"
+                    android:paddingRight="18dip"
+                    android:layout_width="96dip"
                     android:layout_height="wrap_content"
                     android:gravity="center"
+                    android:visibility="gone"
                     />
             </com.android.systemui.statusbar.tablet.ShirtPocket>
             <com.android.systemui.statusbar.tablet.InputMethodButton
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java
index 4d0835f..698f5af 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java
@@ -81,7 +81,7 @@ public class ShirtPocket extends FrameLayout {
         mIcon.setImageResource(mClipping == null
                 ? R.drawable.ic_sysbar_pocket_hidden
                 : R.drawable.ic_sysbar_pocket_holding);
-        mIcon.setVisibility(mClipping == null ? View.INVISIBLE : View.VISIBLE);
+        mIcon.setVisibility(mClipping == null ? View.GONE : View.VISIBLE);
     }
     
     private void showWindow() {
-- 
cgit v1.1