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

Commit d1e5b5ce authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Updating the paddings in folder cell" into ub-launcher3-calgary-polish

parents 80e6aa4b baec6ffa

res/layout/user_folder.xml

+7 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        android:layout_height="match_parent"

        android:paddingLeft="4dp"

        android:paddingRight="4dp"

        android:paddingTop="8dp"

        android:paddingTop="4dp"

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



    <LinearLayout
@@ -37,8 +37,8 @@ 
        android:layout_height="wrap_content"

        android:clipChildren="false"

        android:orientation="horizontal"

        android:paddingLeft="8dp"

        android:paddingRight="8dp" >

        android:paddingLeft="12dp"

        android:paddingRight="12dp" >



        <com.android.launcher3.ExtendedEditText

            android:id="@+id/folder_name"
@@ -51,13 +51,14 @@ 
            android:gravity="center_horizontal"

            android:hint="@string/folder_hint_text"

            android:imeOptions="flagNoExtractUi"

            android:paddingBottom="8dp"

            android:paddingTop="4dp"

            android:paddingBottom="@dimen/folder_label_padding"

            android:paddingTop="@dimen/folder_label_padding"

            android:singleLine="true"

            android:textColor="#ff777777"

            android:includeFontPadding="false"

            android:textColorHighlight="#ffCCCCCC"

            android:textColorHint="#ff808080"

            android:textSize="14sp" />

            android:textSize="@dimen/folder_label_text_size" />



        <com.android.launcher3.pageindicators.PageIndicatorDots

            android:id="@+id/folder_page_indicator"

res/layout/user_folder_icon_normalized.xml

+8 −8
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 
        android:id="@+id/folder_content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingLeft="8dp"

        android:paddingRight="8dp"

        android:paddingTop="8dp"

        android:paddingLeft="4dp"

        android:paddingRight="4dp"

        android:paddingTop="4dp"

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



    <LinearLayout
@@ -37,8 +37,8 @@ 
        android:layout_height="wrap_content"

        android:clipChildren="false"

        android:orientation="horizontal"

        android:paddingLeft="8dp"

        android:paddingRight="8dp" >

        android:paddingLeft="12dp"

        android:paddingRight="12dp" >



        <com.android.launcher3.ExtendedEditText

            android:id="@+id/folder_name"
@@ -52,13 +52,13 @@ 
            android:gravity="center_horizontal"

            android:hint="@string/folder_hint_text"

            android:imeOptions="flagNoExtractUi"

            android:paddingBottom="12dp"

            android:paddingTop="4dp"

            android:paddingBottom="@dimen/folder_label_padding"

            android:paddingTop="@dimen/folder_label_padding"

            android:singleLine="true"

            android:textColor="#EE777777"

            android:textColorHighlight="#ffCCCCCC"

            android:textColorHint="#ff808080"

            android:textSize="14sp" />

            android:textSize="@dimen/folder_label_text_size" />



        <com.android.launcher3.pageindicators.PageIndicatorDots

            android:id="@+id/folder_page_indicator"

res/values/attrs.xml

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
        <attr name="iconDisplay" format="integer">

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

            <enum name="all_apps" value="1" />

            <enum name="widget_section" value="2" />

            <enum name="folder" value="2" />

            <enum name="widget_section" value="3" />

        </attr>

        <attr name="deferShadowGeneration" format="boolean" />

        <attr name="customShadows" format="boolean" />

res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -137,6 +137,12 @@ 
    <dimen name="folder_preview_padding">6dp</dimen>

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



    <dimen name="folder_cell_x_padding">9dp</dimen>

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

    <dimen name="folder_child_text_size">13sp</dimen>

    <dimen name="folder_label_padding">12dp</dimen>

    <dimen name="folder_label_text_size">14sp</dimen>



<!-- Sizes for managed profile badges -->

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

    <dimen name="profile_badge_margin">5dp</dimen>

res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -74,7 +74,11 @@ 
        <item name="android:background">@null</item>

        <item name="android:textColor">@color/quantum_panel_text_color</item>

        <item name="android:shadowRadius">0</item>

        <item name="android:textSize">@dimen/folder_child_text_size</item>

        <item name="android:gravity">center</item>

        <item name="android:includeFontPadding">false</item>

        <item name="customShadows">false</item>

        <item name="iconDisplay">folder</item>

    </style>



    <style name="Icon.DeepShortcut">