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

Commit 063cb2d8 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

TaskMenu in overview UI polish 

Bug: 188168717
Test: TaskMenuLooks closer to mocks.
Change-Id: I1560b66a48c4c70c7c79f7307b2b76f22e30c653
parent 81f5ff3b

quickstep/res/drawable/task_menu_bg.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ 
-->



<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <solid android:color="?attr/popupColorPrimary" />

    <solid android:color="@android:color/transparent"/>

    <corners android:radius="@dimen/task_menu_corner_radius"/>

</shape>

quickstep/res/layout/task_menu.xml

+9 −7
Original line number Diff line number Diff line
@@ -20,18 +20,20 @@ 
    android:layout_height="wrap_content"

    android:animateLayoutChanges="true"

    android:background="@drawable/task_menu_bg"

    android:paddingBottom="@dimen/task_card_menu_shadow_height"

    android:orientation="vertical"

    android:visibility="invisible">



    <TextView

        android:id="@+id/task_name"

        android:background="?android:attr/textColorPrimary"

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="16dp"

        android:textSize="12sp"/>

        android:layout_height="match_parent"

        android:gravity="center"

        android:layout_marginBottom="2dp"

        android:paddingTop="@dimen/task_card_menu_option_vertical_padding"

        android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"

        android:textSize="24sp"/>



    <LinearLayout

        android:id="@+id/menu_option_layout"
@@ -39,6 +41,6 @@ 
        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:divider="@drawable/all_apps_divider"

        android:showDividers="beginning" />

        android:showDividers="middle" />



</com.android.quickstep.views.TaskMenuView>
 
 No newline at end of file

quickstep/res/layout/task_view_menu_option.xml

+4 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:orientation="vertical"

    android:paddingTop="@dimen/task_card_menu_option_vertical_padding"

    android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"

    android:background="?android:attr/selectableItemBackground"

    android:background="?android:attr/textColorPrimary"

    android:theme="@style/PopupItem" >



    <View
@@ -30,7 +30,7 @@ 
      android:layout_height="@dimen/system_shortcut_icon_size"

      android:layout_marginStart="@dimen/task_menu_option_start_margin"

      android:layout_gravity="center_horizontal"

      android:backgroundTint="?android:attr/textColorTertiary"/>

      android:backgroundTint="?android:attr/textColorPrimaryInverse"/>



    <TextView

        style="@style/BaseIcon"
@@ -38,9 +38,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/task_menu_option_start_margin"

        android:textSize="12sp"

        android:textColor="?android:attr/textColorPrimary"

        android:fontFamily="sans-serif"

        android:textSize="14sp"

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:focusable="false" />



</LinearLayout>

quickstep/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
    <!-- For Launchers that want to override the default dialog corner radius -->

    <dimen name="task_corner_radius_override">-1dp</dimen>



    <!--  Task Menu View  -->

    <dimen name="task_menu_corner_radius">22dp</dimen>

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

    <dimen name="overview_proactive_row_bottom_margin">16dp</dimen>
@@ -73,6 +75,7 @@ 
    <!-- 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">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">12dp</dimen>

    <!-- Copied from framework resource:

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

+11 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.animation.AnimatorSet; 
import android.animation.ObjectAnimator;

import android.content.Context;

import android.graphics.Outline;

import android.graphics.PointF;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.view.Gravity;
@@ -227,18 +228,24 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange 
    private void orientAroundTaskView(TaskView taskView) {

        PagedOrientationHandler orientationHandler = taskView.getPagedOrientationHandler();

        measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);

        float taskInsetMargin = getResources().getDimension(R.dimen.task_card_margin);

        orientationHandler.setTaskMenuAroundTaskView(this, taskInsetMargin);

        mActivity.getDragLayer().getDescendantRectRelativeToSelf(taskView, sTempRect);

        Rect insets = mActivity.getDragLayer().getInsets();

        BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams();

        // TODO(b/186583656) Move the entire menu to the center/make smaller than thumbnail width

        params.width = orientationHandler.getTaskMenuWidth(taskView.getThumbnail());

        int padding = getResources()

                .getDimensionPixelSize(R.dimen.task_card_menu_option_vertical_padding);

        params.width = orientationHandler.getTaskMenuWidth(taskView.getThumbnail()) - (2 * padding);

        // Gravity set to Left instead of Start as sTempRect.left measures Left distance not Start

        params.gravity = Gravity.LEFT;

        setLayoutParams(params);

        setScaleX(taskView.getScaleX());

        setScaleY(taskView.getScaleY());

        orientationHandler.setTaskMenuLayoutOrientation(

        orientationHandler.setTaskOptionsMenuLayoutOrientation(

                mActivity.getDeviceProfile(), mOptionLayout);

        PointF additionalInset = orientationHandler.getAdditionalInsetForTaskMenu(taskInsetMargin);

        insets.left += additionalInset.x;

        insets.top += additionalInset.y;

        setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top, 0);

    }