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

Commit 1feadf7d authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Improve spaces for folders" into tm-qpr-dev

parents 881588bf b35faed6

res/layout/user_folder_icon_normalized.xml

+3 −3
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ 
    <LinearLayout

        android:id="@+id/folder_footer"

        android:layout_width="match_parent"

        android:layout_height="@dimen/folder_label_height"

        android:layout_height="@dimen/folder_footer_height_default"

        android:clipChildren="false"

        android:orientation="horizontal"

        android:paddingLeft="12dp"

        android:paddingRight="12dp">

        android:paddingLeft="@dimen/folder_footer_horiz_padding"

        android:paddingRight="@dimen/folder_footer_horiz_padding">



        <com.android.launcher3.folder.FolderNameEditText

            android:id="@+id/folder_name"

res/values-sw720dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -43,4 +43,7 @@ 


<!-- Bottom sheet-->

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



    <!--  Folder spaces  -->

    <dimen name="folder_footer_horiz_padding">24dp</dimen>

</resources>

res/values/attrs.xml

+19 −13
Original line number Diff line number Diff line
@@ -141,9 +141,12 @@ 
        <attr name="numColumns" format="integer" />

        <!--  numSearchContainerColumns defaults to numColumns, if not specified -->

        <attr name="numSearchContainerColumns" format="integer" />



        <!-- numFolderRows & numFolderColumns defaults to numRows & numColumns, if not specified -->

        <attr name="numFolderRows" format="integer" />

        <attr name="numFolderColumns" format="integer" />

        <attr name="folderStyle" format="reference" />



        <!-- numAllAppsColumns defaults to numColumns, if not specified -->

        <attr name="numAllAppsColumns" format="integer" />

        <!-- Number of columns to use when extending the all-apps size,
@@ -333,19 +336,6 @@ 
        if not specified -->

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



        <!-- defaults to minCellHeight if not specified

        when GridDisplayOption#isScalable is true. -->

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

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

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



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

        <!-- space to be used horizontally and vertically -->

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



        <!-- defaults to folderBorderSpace vertical, if not specified -->

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



        <!-- defaults to res.hotseat_bar_bottom_space_default, if not specified -->

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

        <!-- defaults to hotseatBarBottomSpace, if not specified -->
@@ -394,6 +384,22 @@ 


    </declare-styleable>



    <declare-styleable name="FolderDisplayStyle">

        <!-- defaults to minCellHeight if not specified

        when GridDisplayOption#isScalable is true. -->

        <attr name="folderCellHeight" format="dimension" />

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

        <attr name="folderCellWidth" format="dimension" />

        <!-- space to be used horizontally and vertically between icons,

        and to the left and right of folder -->

        <attr name="folderBorderSpace" format="dimension" />

        <!-- height of the footer of the folder -->

        <attr name="folderFooterHeight" format="dimension" />

        <!-- padding on top of the folder -->

        <attr name="folderTopPadding" format="dimension" />

    </declare-styleable>





    <declare-styleable name="CellLayout">

        <attr name="containerType" format="integer">

            <enum name="workspace" value="0" />

res/values/dimens.xml

+5 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ 
    <dimen name="folder_cell_y_padding">6dp</dimen>

    <!-- label text size = workspace text size multiplied by this scale -->

    <dimen name="folder_label_text_scale">1.14</dimen>

    <dimen name="folder_label_height">56dp</dimen>

    <dimen name="folder_footer_height_default">56dp</dimen>



    <dimen name="folder_content_padding_left_right">8dp</dimen>

    <dimen name="folder_content_padding_top">16dp</dimen>
@@ -441,4 +441,8 @@ 


    <!-- State transition -->

    <item name="workspace_content_scale" format="float" type="dimen">0.97</item>



    <!--  Folder spaces  -->

    <dimen name="folder_top_padding_default">24dp</dimen>

    <dimen name="folder_footer_horiz_padding">20dp</dimen>

</resources>

res/values/styles.xml

+9 −0
Original line number Diff line number Diff line
@@ -309,4 +309,13 @@ 
        <item name="android:windowLightStatusBar">true</item>

        <item name="android:windowTranslucentStatus">true</item>

    </style>



    <style name="FolderDefaultStyle">

        <item name="folderTopPadding">24dp</item>

        <item name="folderCellHeight">94dp</item>

        <item name="folderCellWidth">80dp</item>

        <item name="folderBorderSpace">16dp</item>

        <item name="folderFooterHeight">56dp</item>

    </style>



</resources>