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

Commit 6178f13e authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Moving the QSB out of the cell layout to the Drag layer 

This allows better edge matching for the QSB. The QSB position
is kept synchronized with the page scroll and all-apps transition.
But its not visible in spring loaded and overview mode

Change-Id: I4e6723607ea966ee672273a9ca67c792fd6b5661
parent ba162aa7

res/layout-land/launcher.xml

+7 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ 
            android:layout_height="@dimen/dynamic_grid_page_indicator_height"

            android:layout_gravity="bottom|left"/>



        <!-- A place holder view instead of the QSB in transposed layout -->

        <View

            android:layout_width="0dp"

            android:layout_height="10dp"

            android:id="@+id/workspace_blocked_row" />



        <include layout="@layout/widgets_view"

            android:id="@+id/widgets_view"

            android:layout_width="match_parent"
@@ -71,6 +77,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="invisible" />



    </com.android.launcher3.dragndrop.DragLayer>



</com.android.launcher3.LauncherRootView>

res/layout-port/launcher.xml

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
            android:id="@+id/workspace"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            launcher:pageIndicator="@+id/page_indicator">

        </com.android.launcher3.Workspace>
@@ -61,6 +62,10 @@ 
            android:id="@+id/drop_target_bar"

            layout="@layout/drop_target_bar_horz" />



        <include

            layout="@layout/qsb_container"

            android:id="@+id/qsb_container" />



        <include layout="@layout/widgets_view"

            android:id="@+id/widgets_view"

            android:layout_width="match_parent"

res/layout-sw720dp/launcher.xml

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
        <!-- The workspace contains 5 screens of cells -->

        <!-- DO NOT CHANGE THE ID -->

        <com.android.launcher3.Workspace

            android:layout_gravity="center"

            android:id="@+id/workspace"

            android:layout_width="match_parent"

            android:layout_height="match_parent"
@@ -60,6 +61,10 @@ 
            android:layout_width="match_parent"

            android:layout_height="@dimen/dynamic_grid_page_indicator_height" />



        <include

            layout="@layout/qsb_container"

            android:id="@+id/qsb_container" />



        <include layout="@layout/widgets_view"

            android:id="@+id/widgets_view"

            android:layout_width="match_parent"

res/layout/qsb_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        xmlns:android="http://schemas.android.com/apk/res/android"

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="0dp"

        android:id="@+id/qsb_container"

        android:padding="0dp" >

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ 
    <!-- View ID to use for QSB widget -->

    <item type="id" name="qsb_widget" />



    <!-- View ID to use for blocked area on the first screen -->

    <item type="id" name="workspace_blocked_row" />



    <!-- View ID used by cell layout to jail its content -->

    <item type="id" name="cell_layout_jail_id" />