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

Commit 0b070d93 authored by Jeremy Sim's avatar Jeremy Sim
Browse files

Fix clipping issue when dragging app pair icons 

This CL changes AppPairIcon#getWorkspaceVisualDragBounds() to return the correct icon bounds, fixing an issue where the icon would appear clipped when being dragged.

Fixes: 312299947
Test: Icon is no longer clipped while dragging
Flag: ACONFIG com.android.wm.shell.enable_app_pairs DEVELOPMENT
Change-Id: I103bdf53bf34d751147e1ba892f36145f04175e4
parent 23fcbf2f

src/com/android/launcher3/apppairs/AppPairIcon.java

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ public class AppPairIcon extends FrameLayout implements DraggableView, Reorderab 


    // Required for DraggableView

    @Override

    public void getWorkspaceVisualDragBounds(Rect bounds) {

        mAppPairName.getIconBounds(bounds);

    public void getWorkspaceVisualDragBounds(Rect outBounds) {

        mIconGraphic.getIconBounds(outBounds);

    }



    /** Sets the visibility of the icon's title text */

src/com/android/launcher3/apppairs/AppPairIconGraphic.kt

+18 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.launcher3.apppairs 


import android.content.Context

import android.graphics.Canvas

import android.graphics.Rect

import android.graphics.drawable.Drawable

import android.util.AttributeSet

import android.view.Gravity
@@ -28,9 +29,8 @@ import com.android.launcher3.DeviceProfile 
 * A FrameLayout marking the area on an [AppPairIcon] where the visual icon will be drawn. One of

 * two child UI elements on an [AppPairIcon], along with a BubbleTextView holding the text title.

 */

class AppPairIconGraphic

@JvmOverloads

constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {

class AppPairIconGraphic @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :

    FrameLayout(context, attrs) {

    companion object {

        // Design specs -- the below ratios are in relation to the size of a standard app icon.

        private const val OUTER_PADDING_SCALE = 1 / 30f
@@ -59,6 +59,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context 
    // The app pairs icon appears differently in portrait and landscape.

    var isLeftRightSplit = false



    private lateinit var parentIcon: AppPairIcon

    private lateinit var appPairBackground: Drawable

    private lateinit var appIcon1: Drawable

    private lateinit var appIcon2: Drawable
@@ -74,15 +75,27 @@ constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context 
        bigRadius = BIG_RADIUS_SCALE * defaultIconSize

        smallRadius = SMALL_RADIUS_SCALE * defaultIconSize

        isLeftRightSplit = grid.isLeftRightSplit

        parentIcon = icon



        appPairBackground = AppPairIconBackground(context, this)

        appPairBackground.setBounds(0, 0, backgroundSize.toInt(), backgroundSize.toInt())

        appIcon1 = icon.info.contents[0].newIcon(context)

        appIcon2 = icon.info.contents[1].newIcon(context)

        appIcon1 = parentIcon.info.contents[0].newIcon(context)

        appIcon2 = parentIcon.info.contents[1].newIcon(context)

        appIcon1.setBounds(0, 0, memberIconSize.toInt(), memberIconSize.toInt())

        appIcon2.setBounds(0, 0, memberIconSize.toInt(), memberIconSize.toInt())

    }



    /** Gets this icon graphic's bounds, with respect to the parent icon's coordinate system. */

    fun getIconBounds(outBounds: Rect) {

        outBounds.set(0, 0, backgroundSize.toInt(), backgroundSize.toInt())

        outBounds.offset(

            // x-coordinate in parent's coordinate system

            ((parentIcon.width - backgroundSize) / 2).toInt(),

            // y-coordinate in parent's coordinate system

            parentIcon.paddingTop + outerPadding.toInt()

        )

    }



    override fun dispatchDraw(canvas: Canvas) {

        super.dispatchDraw(canvas)