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

Commit 953a9e14 authored by Mady Mellor's avatar Mady Mellor
Browse files

Update dismiss to new spec 

1 - larger gradient (same for both phone & tablet)
2 - gradient is now based on theme color

Test: manual - have a bubble, drag to dismiss it, observe the gradient
Bug: 217211205
Change-Id: Ibef23992089f0ae33dd93f9528a3ea2887aae465
parent 5960382a

libs/WindowManager/Shell/res/values/dimen.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
    <dimen name="dismiss_circle_size">96dp</dimen>

    <dimen name="dismiss_circle_small">60dp</dimen>



    <!-- The height of the gradient indicating the dismiss edge when moving a PIP. -->

    <dimen name="floating_dismiss_gradient_height">250dp</dimen>

    <!-- The height of the gradient indicating the dismiss edge when moving a PIP or bubble. -->

    <dimen name="floating_dismiss_gradient_height">548dp</dimen>



    <!-- The padding around a PiP actions. -->

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

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/DismissView.kt

+43 −8
Original line number Diff line number Diff line
@@ -16,11 +16,16 @@ 


package com.android.wm.shell.bubbles



import android.animation.ObjectAnimator

import android.content.Context

import android.graphics.drawable.TransitionDrawable

import android.graphics.Color

import android.graphics.drawable.GradientDrawable

import android.util.IntProperty

import android.view.Gravity

import android.view.View

import android.view.ViewGroup

import android.view.WindowManager

import android.view.WindowInsets

import android.widget.FrameLayout

import androidx.dynamicanimation.animation.DynamicAnimation

import androidx.dynamicanimation.animation.SpringForce.DAMPING_RATIO_LOW_BOUNCY
@@ -28,8 +33,6 @@ import androidx.dynamicanimation.animation.SpringForce.STIFFNESS_LOW 
import com.android.wm.shell.R

import com.android.wm.shell.animation.PhysicsAnimator

import com.android.wm.shell.common.DismissCircleView

import android.view.WindowInsets

import android.view.WindowManager



/*

 * View that handles interactions between DismissCircleView and BubbleStackView.
@@ -41,9 +44,21 @@ class DismissView(context: Context) : FrameLayout(context) { 


    private val animator = PhysicsAnimator.getInstance(circle)

    private val spring = PhysicsAnimator.SpringConfig(STIFFNESS_LOW, DAMPING_RATIO_LOW_BOUNCY)

    private val DISMISS_SCRIM_FADE_MS = 200

    private val DISMISS_SCRIM_FADE_MS = 200L

    private var wm: WindowManager =

            context.getSystemService(Context.WINDOW_SERVICE) as WindowManager

    private var gradientDrawable = createGradient()



    private val GRADIENT_ALPHA: IntProperty<GradientDrawable> =

            object : IntProperty<GradientDrawable>("alpha") {

        override fun setValue(d: GradientDrawable, percent: Int) {

            d.alpha = percent

        }

        override fun get(d: GradientDrawable): Int {

            return d.alpha

        }

    }



    init {

        setLayoutParams(LayoutParams(

            ViewGroup.LayoutParams.MATCH_PARENT,
@@ -53,8 +68,7 @@ class DismissView(context: Context) : FrameLayout(context) { 
        setClipToPadding(false)

        setClipChildren(false)

        setVisibility(View.INVISIBLE)

        setBackgroundResource(

            R.drawable.floating_dismiss_gradient_transition)

        setBackgroundDrawable(gradientDrawable)



        val targetSize: Int = resources.getDimensionPixelSize(R.dimen.dismiss_circle_size)

        addView(circle, LayoutParams(targetSize, targetSize,
@@ -71,7 +85,11 @@ class DismissView(context: Context) : FrameLayout(context) { 
        if (isShowing) return

        isShowing = true

        setVisibility(View.VISIBLE)

        (getBackground() as TransitionDrawable).startTransition(DISMISS_SCRIM_FADE_MS)

        val alphaAnim = ObjectAnimator.ofInt(gradientDrawable, GRADIENT_ALPHA,

                gradientDrawable.alpha, 255)

        alphaAnim.setDuration(DISMISS_SCRIM_FADE_MS)

        alphaAnim.start()



        animator.cancel()

        animator

            .spring(DynamicAnimation.TRANSLATION_Y, 0f, spring)
@@ -85,7 +103,10 @@ class DismissView(context: Context) : FrameLayout(context) { 
    fun hide() {

        if (!isShowing) return

        isShowing = false

        (getBackground() as TransitionDrawable).reverseTransition(DISMISS_SCRIM_FADE_MS)

        val alphaAnim = ObjectAnimator.ofInt(gradientDrawable, GRADIENT_ALPHA,

                gradientDrawable.alpha, 0)

        alphaAnim.setDuration(DISMISS_SCRIM_FADE_MS)

        alphaAnim.start()

        animator

            .spring(DynamicAnimation.TRANSLATION_Y, height.toFloat(),

                spring)
@@ -104,6 +125,20 @@ class DismissView(context: Context) : FrameLayout(context) { 
        circle.requestLayout()

    }



    private fun createGradient(): GradientDrawable {

        val gradientColor = context.resources.getColor(android.R.color.system_neutral1_900)

        val alpha = 0.7f * 255

        val gradientColorWithAlpha = Color.argb(alpha.toInt(),

                Color.red(gradientColor),

                Color.green(gradientColor),

                Color.blue(gradientColor))

        val gd = GradientDrawable(

                GradientDrawable.Orientation.BOTTOM_TOP,

                intArrayOf(gradientColorWithAlpha, Color.TRANSPARENT))

        gd.setAlpha(0)

        return gd

    }



    private fun updatePadding() {

        val insets: WindowInsets = wm.getCurrentWindowMetrics().getWindowInsets()

        val navInset = insets.getInsetsIgnoringVisibility(