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

Commit 0966072c authored by Jon Miranda's avatar Jon Miranda
Browse files

Portrait grid changes for Workspace/All Apps. 

Bug: 37015359
Change-Id: Ifbdd0e71c36e532b189e02283e3eeb562ebe2654
parent 663bb990

res/layout/all_apps_icon.xml

+2 −3
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ 
    android:stateListAnimator="@animator/all_apps_fastscroll_icon_anim"

    android:stateListAnimator="@animator/all_apps_fastscroll_icon_anim"

    launcher:iconDisplay="all_apps"

    launcher:iconDisplay="all_apps"

    launcher:centerVertically="true"

    launcher:centerVertically="true"

    android:paddingLeft="4dp"

    android:paddingLeft="@dimen/dynamic_grid_cell_padding_x"

    android:paddingRight="4dp"

    android:paddingRight="@dimen/dynamic_grid_cell_padding_x" />

    android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding" />

res/layout/page_indicator.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,6 @@ 
            android:id="@+id/all_apps_handle"

            android:id="@+id/all_apps_handle"

            android:layout_width="48dp"

            android:layout_width="48dp"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            android:layout_gravity="top|center"

            android:scaleType="centerInside"/>

            android:scaleType="centerInside"/>

</com.android.launcher3.pageindicators.PageIndicatorLineCaret>
 
</com.android.launcher3.pageindicators.PageIndicatorLineCaret>

res/layout/qsb_default_view.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <LinearLayout

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="48dp"

        android:layout_height="48dp"

        android:layout_margin="16dp"

        android:layout_margin="8dp"

        android:layout_gravity="center_vertical"

        android:layout_gravity="center_vertical"

        android:background="@drawable/round_rect_primary"

        android:background="@drawable/round_rect_primary"

        android:elevation="2dp"

        android:elevation="2dp"

res/values/dimens.xml

+7 −4
Original line number Original line Diff line number Diff line
@@ -16,8 +16,8 @@ 




<resources>

<resources>

<!-- Dynamic Grid -->

<!-- Dynamic Grid -->

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

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

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

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

    <dimen name="dynamic_grid_page_indicator_line_height">1dp</dimen>

    <dimen name="dynamic_grid_page_indicator_line_height">1dp</dimen>

    <dimen name="dynamic_grid_page_indicator_gutter_width_left_nav_bar">38dp</dimen>

    <dimen name="dynamic_grid_page_indicator_gutter_width_left_nav_bar">38dp</dimen>

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

    <dimen name="dynamic_grid_page_indicator_gutter_width_right_nav_bar">48dp</dimen>
@@ -26,14 +26,17 @@ 
    <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen>

    <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen>

    <dimen name="dynamic_grid_overview_bar_item_width">80dp</dimen>

    <dimen name="dynamic_grid_overview_bar_item_width">80dp</dimen>

    <dimen name="dynamic_grid_overview_bar_spacer_width">25dp</dimen>

    <dimen name="dynamic_grid_overview_bar_spacer_width">25dp</dimen>

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

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

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

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

    <!-- Minimum space between workspace and hotseat in spring loaded mode -->

    <!-- Minimum space between workspace and hotseat in spring loaded mode -->

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

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





    <!-- dynamic_grid_edge_margin / 2 -->

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



    <!-- Hotseat -->

    <!-- Hotseat -->

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

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

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

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

    <dimen name="dynamic_grid_hotseat_height">80dp</dimen>

    <dimen name="dynamic_grid_hotseat_height">80dp</dimen>

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

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

src/com/android/launcher3/BubbleTextView.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -168,6 +168,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { 
        int defaultIconSize = grid.iconSizePx;

        int defaultIconSize = grid.iconSizePx;

        if (display == DISPLAY_WORKSPACE) {

        if (display == DISPLAY_WORKSPACE) {

            setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx);

            setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx);

            setCompoundDrawablePadding(grid.iconDrawablePaddingPx);

        } else if (display == DISPLAY_ALL_APPS) {

        } else if (display == DISPLAY_ALL_APPS) {

            setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx);

            setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx);

            setCompoundDrawablePadding(grid.allAppsIconDrawablePaddingPx);

            setCompoundDrawablePadding(grid.allAppsIconDrawablePaddingPx);