diff options
| author | satok <satok@google.com> | 2010-12-02 19:23:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-02 19:23:29 -0800 |
| commit | eae7133bf6aff5a702b4bae81614aeec6cb3381b (patch) | |
| tree | 903b07ad41cedf409509200824c8ad884f167097 /packages | |
| parent | 63f4e2334716e9b040ca0ba758e39894186dc9b5 (diff) | |
| parent | 2993f18b068f2b1ea8d4c7779aad86a18650a409 (diff) | |
| download | frameworks_base-eae7133bf6aff5a702b4bae81614aeec6cb3381b.zip frameworks_base-eae7133bf6aff5a702b4bae81614aeec6cb3381b.tar.gz frameworks_base-eae7133bf6aff5a702b4bae81614aeec6cb3381b.tar.bz2 | |
Merge "Make the size of "shirt pocket" 0 when the icon of "shirt pocket" is invisible"
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/layout-xlarge/status_bar.xml | 10 | ||||
| -rw-r--r-- | packages/SystemUI/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() { |