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

Commit a2f87bef authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Automerger Merge Worker
Browse files

Merge "Icon sizes/ keyline / font for AA+ results" into sc-dev am: 02b62ed6 

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

Change-Id: If8f00a4cb12d7942c0d582a45a43372ce89f030a
parents f9c841c4 02b62ed6

res/layout/all_apps.xml

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
        android:layout_below="@id/search_container_all_apps"

        android:clipToPadding="false"

        android:paddingTop="@dimen/all_apps_header_top_padding"

        android:paddingBottom="@dimen/all_apps_header_bottom_padding"

        android:orientation="vertical" >



        <include layout="@layout/floating_header_content" />

res/layout/all_apps_personal_work_tabs.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:background="@drawable/personal_work_tabs_ripple"

        android:text="@string/all_apps_personal_tab"

        android:textColor="@color/all_apps_tab_text"

        android:textSize="16sp" />

        android:textSize="14sp" />



    <Button

        android:id="@+id/tab_work"
@@ -41,5 +41,5 @@ 
        android:background="@drawable/personal_work_tabs_ripple"

        android:text="@string/all_apps_work_tab"

        android:textColor="@color/all_apps_tab_text"

        android:textSize="16sp" />

        android:textSize="14sp" />

</com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
 
 No newline at end of file

res/values/attrs.xml

+3 −2
Original line number Diff line number Diff line
@@ -57,8 +57,9 @@ 
            <enum name="folder" value="2" />

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

            <enum name="shortcut_popup" value="4" />

            <enum name="hero_app" value="5" />

            <enum name="taskbar" value="6" />

            <enum name="taskbar" value="5" />

            <enum name="search_result_tall" value="6" />

            <enum name="search_result_small" value="7" />

        </attr>

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

    </declare-styleable>

res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
    <dimen name="all_apps_header_tab_height">48dp</dimen>

    <dimen name="all_apps_tabs_indicator_height">2dp</dimen>

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

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

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

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

    <dimen name="all_apps_tabs_vertical_padding">6dp</dimen>
@@ -315,4 +316,7 @@ 
    <dimen name="grid_visualization_rounding_radius">22dp</dimen>

    <dimen name="grid_visualization_cell_spacing">6dp</dimen>



<!-- Search results related parameters -->

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

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

</resources>

src/com/android/launcher3/BubbleTextView.java

+8 −4
Original line number Diff line number Diff line
@@ -80,8 +80,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
    private static final int DISPLAY_WORKSPACE = 0;

    private static final int DISPLAY_ALL_APPS = 1;

    private static final int DISPLAY_FOLDER = 2;

    private static final int DISPLAY_HERO_APP = 5;

    protected static final int DISPLAY_TASKBAR = 6;

    protected static final int DISPLAY_TASKBAR = 5;

    private static final int DISPLAY_SEARCH_RESULT = 6;

    private static final int DISPLAY_SEARCH_RESULT_SMALL = 7;



    private static final int[] STATE_PRESSED = new int[]{android.R.attr.state_pressed};

    private static final float HIGHLIGHT_SCALE = 1.16f;
@@ -187,8 +188,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
            setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.folderChildTextSizePx);

            setCompoundDrawablePadding(grid.folderChildDrawablePaddingPx);

            defaultIconSize = grid.folderChildIconSizePx;

        } else if (mDisplay == DISPLAY_HERO_APP) {

            defaultIconSize = grid.allAppsIconSizePx;

        } else if (mDisplay == DISPLAY_SEARCH_RESULT) {

            defaultIconSize = getResources().getDimensionPixelSize(R.dimen.search_row_icon_size);

        } else if (mDisplay == DISPLAY_SEARCH_RESULT_SMALL) {

            defaultIconSize = getResources().getDimensionPixelSize(

                    R.dimen.search_row_small_icon_size);

        } else if (mDisplay == DISPLAY_TASKBAR) {

            defaultIconSize = grid.iconSizePx;

        } else {