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

Commit 9241fe62 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Set correct divider dimension for task menu options" into sc-dev am: 7d0826f3 

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

Change-Id: Ia48a1e6b2ebab8f94f374d0c4369bf4b62d13bea
parents 5e8fff5e 7d0826f3

quickstep/res/layout/task_menu.xml

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:divider="@drawable/all_apps_divider"

        android:showDividers="middle" />



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

quickstep/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
    <!--  Task Menu View  -->

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

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

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

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

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

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

+12 −1
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import android.content.Context; 
import android.graphics.Outline;

import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.drawable.ShapeDrawable;

import android.graphics.drawable.shapes.RectShape;

import android.util.AttributeSet;

import android.view.Gravity;

import android.view.MotionEvent;
@@ -226,6 +228,8 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange 
        PagedOrientationHandler orientationHandler = taskView.getPagedOrientationHandler();

        measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);

        orientationHandler.setTaskMenuAroundTaskView(this, mTaskInsetMargin);



        // Get Position

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

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

        BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams();
@@ -237,8 +241,15 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange 
        setLayoutParams(params);

        setScaleX(taskView.getScaleX());

        setScaleY(taskView.getScaleY());



        // Set divider spacing

        ShapeDrawable divider = new ShapeDrawable(new RectShape());

        divider.getPaint().setColor(getResources().getColor(android.R.color.transparent));

        int dividerSpacing = (int) getResources().getDimension(R.dimen.task_menu_spacing);

        mOptionLayout.setShowDividers(SHOW_DIVIDER_MIDDLE);



        orientationHandler.setTaskOptionsMenuLayoutOrientation(

                mActivity.getDeviceProfile(), mOptionLayout);

                mActivity.getDeviceProfile(), mOptionLayout, dividerSpacing, divider);

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

    }

src/com/android/launcher3/touch/LandscapePagedViewHandler.java

+5 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.res.Resources; 
import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.RectF;

import android.graphics.drawable.ShapeDrawable;

import android.util.FloatProperty;

import android.view.MotionEvent;

import android.view.Surface;
@@ -269,8 +270,11 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { 


    @Override

    public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,

        LinearLayout taskMenuLayout) {

            LinearLayout taskMenuLayout, int dividerSpacing,

            ShapeDrawable dividerDrawable) {

        taskMenuLayout.setOrientation(LinearLayout.HORIZONTAL);

        dividerDrawable.setIntrinsicWidth(dividerSpacing);

        taskMenuLayout.setDividerDrawable(dividerDrawable);

    }



    @Override

src/com/android/launcher3/touch/PagedOrientationHandler.java

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.Matrix; 
import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.RectF;

import android.graphics.drawable.ShapeDrawable;

import android.util.FloatProperty;

import android.view.MotionEvent;

import android.view.VelocityTracker;
@@ -123,7 +124,8 @@ public interface PagedOrientationHandler { 
     * inside task menu view.

     */

    void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,

            LinearLayout taskMenuLayout);

            LinearLayout taskMenuLayout, int dividerSpacing,

            ShapeDrawable dividerDrawable);

    /**

     * Sets layout param attributes for {@link com.android.launcher3.popup.SystemShortcut} child

     * views inside task menu view.