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

Commit 43c4b50c authored by Pat Manning's avatar Pat Manning
Browse files

Update Icon App Chip Menu to new specs. 

Fix: 304228083
Test: TaplOverviewIconAppChipMenuTest
Flag: ACONFIG com.android.launcher3.enable_overview_icon_menu DEVELOPMENT

Change-Id: Ib018c7f59e1141b6f21618b28d411facc937ac7c
parent a20e964c

quickstep/res/layout/icon_app_chip_view.xml

+34 −9
Original line number Diff line number Diff line
@@ -25,11 +25,23 @@ 
    android:autoMirrored="true"

    android:elevation="@dimen/task_thumbnail_icon_menu_elevation" >



    <ImageView

        android:id="@+id/icon_view_background_corners_start"

        android:layout_width="@dimen/task_thumbnail_icon_menu_corner_width"

        android:layout_height="@dimen/task_thumbnail_icon_menu_min_height"

        android:src="@drawable/icon_menu_background_corners"

        android:importantForAccessibility="no" />

    <ImageView

        android:id="@+id/icon_view_background"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:background="@drawable/icon_menu_background"

        android:layout_width="@dimen/task_thumbnail_icon_menu_background_min_width"

        android:layout_height="@dimen/task_thumbnail_icon_menu_min_height"

        android:src="@drawable/icon_menu_background"

        android:importantForAccessibility="no" />

    <ImageView

        android:id="@+id/icon_view_background_corners_end"

        android:layout_width="@dimen/task_thumbnail_icon_menu_corner_width"

        android:layout_height="@dimen/task_thumbnail_icon_menu_min_height"

        android:src="@drawable/icon_menu_background_corners"

        android:importantForAccessibility="no" />



    <com.android.quickstep.views.IconView
@@ -40,20 +52,33 @@ 
        android:importantForAccessibility="no" />



    <TextView

        android:id="@+id/icon_text"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center_vertical"

        android:id="@+id/icon_text_collapsed"

        android:layout_width="@dimen/task_thumbnail_icon_menu_text_width"

        android:layout_height="@dimen/task_thumbnail_icon_menu_drawable_size"

        android:gravity="start|center_vertical"

        android:maxLines="1"

        android:ellipsize="end"

        android:textAlignment="viewStart"

        android:textColor="?androidprv:attr/materialColorOnSurface"

        android:textSize="@dimen/task_thumbnail_icon_menu_text_size"

        android:importantForAccessibility="no" />



    <TextView

        android:id="@+id/icon_text_expanded"

        android:layout_width="@dimen/task_thumbnail_icon_menu_text_max_width"

        android:layout_height="@dimen/task_thumbnail_icon_menu_drawable_size"

        android:gravity="start|center_vertical"

        android:maxLines="1"

        android:ellipsize="end"

        android:textAlignment="viewStart"

        android:textColor="?androidprv:attr/materialColorOnSurface"

        android:textSize="16sp"

        android:textSize="@dimen/task_thumbnail_icon_menu_text_size"

        android:importantForAccessibility="no" />



    <ImageView

        android:id="@+id/icon_arrow"

        android:layout_width="@dimen/task_thumbnail_icon_menu_arrow_size"

        android:layout_height="match_parent"

        android:layout_height="@dimen/task_thumbnail_icon_menu_arrow_size"

        android:background="@drawable/icon_menu_arrow_background"

        android:src="@drawable/ic_chevron_down"

        android:importantForAccessibility="no" />

quickstep/res/layout/task_menu.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
        android:layout_height="match_parent"

        android:gravity="center"

        android:layout_marginBottom="2dp"

        android:paddingTop="@dimen/task_menu_vertical_padding"

        android:paddingBottom="@dimen/task_menu_vertical_padding"

        android:paddingTop="@dimen/task_menu_edge_padding"

        android:paddingBottom="@dimen/task_menu_edge_padding"

        android:textSize="16sp"/>



    <LinearLayout

quickstep/res/layout/task_view_menu_option.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
        android:id="@+id/text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/task_menu_option_start_margin"

        android:layout_marginStart="@dimen/task_menu_option_text_start_margin"

        android:textSize="14sp"

        android:textColor="?androidprv:attr/materialColorOnSurface"

        android:focusable="false" />

quickstep/res/values/dimens.xml

+31 −12
Original line number Diff line number Diff line
@@ -44,32 +44,50 @@ 
    <dimen name="overview_task_margin">16dp</dimen>

    <!--  The horizontal space between tasks  -->

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

    <!--  The width of the thumbnail icon menu  -->

    <dimen name="task_thumbnail_icon_menu_min_width">132dp</dimen>

    <!--  The width of the icon menu text  -->

    <dimen name="task_thumbnail_icon_menu_text_width">62dp</dimen>

    <!--  The max width of the icon menu text  -->

    <dimen name="task_thumbnail_icon_menu_text_max_width">138dp</dimen>

    <!--  The min width of the thumbnail icon menu for non-split tasks  -->

    <dimen name="task_thumbnail_icon_menu_min_width">156dp</dimen>

    <!--  The max width of the thumbnail icon menu  -->

    <dimen name="task_thumbnail_icon_menu_max_width">216dp</dimen>

    <!--  The width of the thumbnail icon menu background  -->

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

    <!--  The width of the icon menu text  -->

    <dimen name="task_thumbnail_icon_menu_text_width">86dp</dimen>

    <!--  The max width of the icon menu text  -->

    <dimen name="task_thumbnail_icon_menu_text_max_width">118dp</dimen>

    <!--  The size of the icon menu text  -->

    <dimen name="task_thumbnail_icon_menu_text_size">16sp</dimen>

    <!--  The max width of the thumbnail icon menu background  -->

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

    <!--  The height of the thumbnail icon menu  -->

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

    <!--  The corner radius of the thumbnail icon menu  -->

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

    <!--  The width of the thumbnail icon menu backgorund's corners when collapsed  -->

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

    <!--  The max height of the thumbnail icon menu  -->

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

    <!--  The size of the icon menu arrow  -->

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

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

    <!--  The size of the icon menu arrow drawable  -->

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

    <!--  The margin around the task icon menu  -->

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

    <!--  The margin at the start of the task icon menu  -->

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

    <!--  The margin at the top of the task icon menu  -->

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

    <!--  The margin at the top of the task icon menu when expanded  -->

    <dimen name="task_thumbnail_icon_menu_top_margin_expanded">4dp</dimen>

    <!--  The margin at the start of the task icon view in the icon menu  -->

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

    <!--  The space around the task icon arrow within the icon menu  -->

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

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

    <!--  The max space around the task icon within the icon menu  -->

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

    <!--  The icon size for the icon menu  -->

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

    <!--  The icon size for the icon menu  -->

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

    <!--  The size of the icon menu's icon touch target  -->

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

    <dimen name="task_thumbnail_icon_menu_drawable_touch_size">44dp</dimen>

    <dimen name="task_thumbnail_icon_menu_elevation">14dp</dimen>



    <dimen name="task_icon_cache_default_icon_size">72dp</dimen>
@@ -113,10 +131,11 @@ 
    <!-- Total space (start + end) between the task card and the edge of the screen

         in various configurations -->

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

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

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

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

    <dimen name="task_card_menu_shadow_height">3dp</dimen>

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

    <dimen name="task_menu_option_text_start_margin">18dp</dimen>

    <!-- Copied from framework resource:

       docked_stack_divider_thickness - 2 * docked_stack_divider_insets -->

    <dimen name="multi_window_task_divider_size">10dp</dimen>

quickstep/src/com/android/quickstep/views/GroupedTaskView.java

+14 −1
Original line number Diff line number Diff line
@@ -372,7 +372,20 @@ public class GroupedTaskView extends TaskView { 
                                    mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx,

                            MeasureSpec.EXACTLY));

        }

        if (!enableOverviewIconMenu()) {

            updateIconPlacement();

            return;

        }



        if (getRecentsView() == null) {

            return;

        }



        int iconMargins = getResources().getDimensionPixelSize(

                R.dimen.task_thumbnail_icon_menu_start_margin) * 2;

        ((IconAppChipView) mIconView).setMaxWidth(mSnapshotView.getMeasuredWidth() - iconMargins);

        ((IconAppChipView) mIconView2).setMaxWidth(mSnapshotView2.getMeasuredWidth() - iconMargins);

        setOrientationState(getRecentsView().getPagedViewOrientedState());

    }



    @Override