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

Commit f8fbfcad authored by Thales Lima's avatar Thales Lima Committed by Automerger Merge Worker
Browse files

Merge "Change size of All Apps bottom sheet" into tm-dev am: 042482e9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17154983

Change-Id: Ie248b0bb7789e1d3548b87e87e8374a6b67d3fc2
parents 37a1664f 042482e9

res/values-sw600dp-land/dimens.xml

+6 −3
Original line number Diff line number Diff line
@@ -26,4 +26,7 @@ 
<!-- Dragging -->

    <dimen name="drop_target_top_margin">0dp</dimen>

    <dimen name="drop_target_bottom_margin">16dp</dimen>



<!-- AllApps -->

    <dimen name="all_apps_bottom_sheet_horizontal_padding">52dp</dimen>

</resources>

res/values-sw600dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


<!-- AllApps -->

    <dimen name="all_apps_search_bar_content_overlap">0dp</dimen>

    <dimen name="all_apps_bottom_sheet_horizontal_padding">46dp</dimen>

    <dimen name="all_apps_bottom_sheet_horizontal_padding">48dp</dimen>



<!-- Fast scroll -->

    <dimen name="fastscroll_popup_width">75dp</dimen>

res/values-sw720dp-land/dimens.xml

+7 −0
Original line number Diff line number Diff line
@@ -18,13 +18,20 @@ 
<!-- Dragging-->

    <dimen name="drop_target_top_margin">0dp</dimen>

    <dimen name="drop_target_bottom_margin">32dp</dimen>



<!-- Dynamic grid -->

    <dimen name="dynamic_grid_edge_margin">21.93dp</dimen>

    <dimen name="cell_layout_padding">29.33dp</dimen>



<!-- Hotseat -->

    <dimen name="spring_loaded_hotseat_top_margin">64dp</dimen>



<!-- AllApps -->

    <dimen name="all_apps_bottom_sheet_horizontal_padding">32dp</dimen>



<!-- Widget picker-->

    <dimen name="widget_list_horizontal_margin">49dp</dimen>



<!-- Bottom sheet-->

    <dimen name="bottom_sheet_extra_top_padding">0dp</dimen>

</resources>

res/values-sw720dp/dimens.xml

+4 −1
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ 


<resources>

<!-- AllApps -->

    <dimen name="all_apps_bottom_sheet_horizontal_padding">65dp</dimen>

    <dimen name="all_apps_bottom_sheet_horizontal_padding">28dp</dimen>



<!-- Dynamic grid -->

    <dimen name="dynamic_grid_edge_margin">27.59dp</dimen>

    <dimen name="cell_layout_padding">36dp</dimen>



<!-- Dragging -->

    <dimen name="drop_target_text_size">20sp</dimen>

    <dimen name="dynamic_grid_drop_target_size">72dp</dimen>
@@ -28,6 +30,7 @@ 
    <dimen name="drop_target_button_gap">32dp</dimen>

    <dimen name="drop_target_top_margin">32dp</dimen>

    <dimen name="drop_target_bottom_margin">32dp</dimen>



<!-- Hotseat -->

    <dimen name="spring_loaded_hotseat_top_margin">164dp</dimen>

res/values/attrs.xml

+19 −0
Original line number Diff line number Diff line
@@ -241,9 +241,28 @@ 
        if not specified -->

        <attr name="borderSpaceTwoPanelLandscapeVertical" format="float" />



        <!-- These min cell values are only used if GridDisplayOption#isScalable is true -->

        <!-- defaults to minCellHeight, if not specified -->

        <attr name="allAppsCellHeight" format="float" />

        <!-- defaults to minCellWidth, if not specified -->

        <attr name="allAppsCellWidth" format="float" />

        <!-- defaults to allAppsCellHeight, if not specified -->

        <attr name="allAppsCellHeightLandscape" format="float" />

        <!-- defaults to allAppsCellWidth, if not specified -->

        <attr name="allAppsCellWidthLandscape" format="float" />

        <!-- defaults to allAppsCellHeight, if not specified -->

        <attr name="allAppsCellHeightTwoPanelPortrait" format="float" />

        <!-- defaults to allAppsCellWidth, if not specified -->

        <attr name="allAppsCellWidthTwoPanelPortrait" format="float" />

        <!-- defaults to allAppsCellHeight, if not specified -->

        <attr name="allAppsCellHeightTwoPanelLandscape" format="float" />

        <!-- defaults to allAppsCellWidth, if not specified -->

        <attr name="allAppsCellWidthTwoPanelLandscape" format="float" />

        <!-- defaults to borderSpace, if not specified -->

        <attr name="allAppsBorderSpace" format="float" />

        <!-- defaults to allAppsBorderSpace, if not specified -->

        <attr name="allAppsBorderSpaceLandscape" format="float" />

        <!-- defaults to allAppsBorderSpace, if not specified -->

        <attr name="allAppsBorderSpaceTwoPanelPortrait" format="float" />

        <!-- defaults to allAppsBorderSpace, if not specified -->

        <attr name="allAppsBorderSpaceTwoPanelLandscape" format="float" />