Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eae7133b authored by satok's avatar satok Committed by Android (Google) Code Review
Browse files

Merge "Make the size of "shirt pocket" 0 when the icon of "shirt pocket" is invisible"

parents 63f4e233 2993f18b

packages/SystemUI/res/layout-xlarge/status_bar.xml

+5 −5
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java

+1 −1
Original line number Diff line number Diff line
@@ -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() {