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

Commit b5d047ca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removing layout handling in DeviceProfile and moving it to individual... 

Merge "Removing layout handling in DeviceProfile and moving it to individual views" into ub-launcher3-master
parents b6077811 07b6929c

quickstep/src/com/android/quickstep/RecentsView.java

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ public class RecentsView extends PagedView { 
        DeviceProfile profile = launcher.getDeviceProfile();

        Rect stableInsets = new Rect();

        WindowManagerWrapper.getInstance().getStableInsets(stableInsets);

        Rect padding = profile.getWorkspacePadding(null);

        Rect padding = new Rect(profile.workspacePadding);



        float taskWidth = profile.widthPx - stableInsets.left - stableInsets.right;

        float taskHeight = profile.heightPx - stableInsets.top - stableInsets.bottom;

res/layout-land/launcher.xml

+1 −3
Original line number Diff line number Diff line
@@ -63,9 +63,7 @@ 
        <include layout="@layout/hotseat"

            android:id="@+id/hotseat"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="right"

            launcher:layout_ignoreInsets="true" />

            android:layout_height="match_parent" />



        <include

            android:id="@+id/drop_target_bar"

res/layout-port/launcher.xml

+1 −2
Original line number Diff line number Diff line
@@ -57,8 +57,7 @@ 
        <include layout="@layout/hotseat"

            android:id="@+id/hotseat"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            launcher:layout_ignoreInsets="true" />

            android:layout_height="match_parent" />



        <!-- Keep these behind the workspace so that they are not visible when

             we go into AllApps -->

res/layout-sw720dp/launcher.xml

+1 −2
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ 
        <include layout="@layout/hotseat"

            android:id="@+id/hotseat"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            launcher:layout_ignoreInsets="true" />

            android:layout_height="match_parent" />



        <include

            android:id="@+id/drop_target_bar"

res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ 
    <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->

    <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer>



    <!-- This constant stores the ratio of the all apps button drawable which

         is used for internal (baked-in) padding -->

    <integer name="config_allAppsButtonPaddingPercent">17</integer>



    <!-- The duration of the animation from search hint to text entry -->

    <integer name="config_searchHintAnimationDuration">50</integer>