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

Commit a54e8725 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Put the pocket back in my pocket for later."

parents 03f00225 c1afcf06

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

+0 −9
Original line number Diff line number Diff line
@@ -91,15 +91,6 @@ 
        </RelativeLayout>

    </FrameLayout>



    <view

        class="com.android.systemui.statusbar.tablet.ShirtPocket$DropZone"

        android:id="@+id/drop_target"

        android:layout_width="512dp"

        android:layout_height="@*android:dimen/status_bar_height"

        android:background="@drawable/pocket_drag_bg"

        android:layout_gravity="right"

        />



    <FrameLayout

        android:id="@+id/bar_shadow_holder"

        android:layout_width="match_parent"

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

+0 −8
Original line number Diff line number Diff line
@@ -42,14 +42,6 @@ 
            android:visibility="gone"

            />

        

        <com.android.systemui.statusbar.tablet.ShirtPocket

            android:id="@+id/shirt_pocket"

            android:layout_width="@*android:dimen/status_bar_height"

            android:layout_height="@*android:dimen/status_bar_height"

            android:background="#FFFF0000"

            android:visibility="gone"

            />



        <com.android.systemui.statusbar.tablet.NotificationIconArea

            android:id="@+id/notificationIcons"

            android:layout_width="wrap_content"

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

+0 −5
Original line number Diff line number Diff line
@@ -392,11 +392,6 @@ public class TabletStatusBar extends StatusBar implements 
        // for redirecting errant bar taps to the IME

        mFakeSpaceBar = sb.findViewById(R.id.fake_space_bar);



        // drag and drop pocket

        ShirtPocket p = (ShirtPocket) sb.findViewById(R.id.shirt_pocket);

        ShirtPocket.DropZone z = (ShirtPocket.DropZone) sb.findViewById(R.id.drop_target);

        z.setPocket(p);



        // "shadows" of the status bar features, for lights-out mode

        mShadow = sb.findViewById(R.id.bar_shadow);

        mShadow.setOnTouchListener(