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

Commit a3d40b05 authored by helencheuk's avatar helencheuk
Browse files

Add focus outline to overview clear all button 

Use the same class BorderAnimator in TaskView to draw focus outline with padding between button and outline as UX design

Bug: 324911125
Test: Manual, launcher overview, use keyboard left arrow to show clear all button, outline should be shown
Flag: LEGACY ENABLE_KEYBOARD_QUICK_SWITCH ENABLED
Change-Id: I62ac2ce7a8f62170421b4318c9fa58805384187b
parent 360d3cd1

quickstep/res/drawable/bg_overview_clear_all_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <item>

        <shape android:shape="rectangle"

            android:tint="?colorButtonNormal">

            <corners android:radius="24dp" />

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

            <solid android:color="?androidprv:attr/materialColorSurfaceBright"/>

        </shape>

    </item>

quickstep/res/layout/overview_clear_all_button.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@ 
<com.android.quickstep.views.ClearAllButton

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    style="@style/OverviewClearAllButton"

    android:id="@+id/clear_all"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:text="@string/recents_clear_all"

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

    launcher:focusBorderColor="?androidprv:attr/materialColorOutline"

    android:textSize="14sp" />
 
 No newline at end of file

quickstep/res/values/attrs.xml

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ 
        <attr name="hoverBorderColor" format="color" />

    </declare-styleable>



    <declare-styleable name="ClearAllButton">

        <!-- focus border color for overview clear all button views -->

        <attr name="focusBorderColor" />

    </declare-styleable>



    <!--

         Gesture nav edu specific attributes. These attributes are used to customize Gesture nav edu

         view lottie animation colors in XML files.

quickstep/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 
    <dimen name="default_task_dismiss_drag_velocity_grid_focus_task">5dp</dimen>



    <dimen name="recents_clear_all_deadzone_vertical_margin">70dp</dimen>

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

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



    <!-- The speed in dp/s at which the user needs to be scrolling in recents such that we start

             loading full resolution screenshots. -->

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

+73 −0
Original line number Diff line number Diff line
@@ -17,15 +17,28 @@ 
package com.android.quickstep.views;



import static com.android.launcher3.Flags.enableGridOnlyOverview;

import static com.android.quickstep.util.BorderAnimator.DEFAULT_BORDER_COLOR;



import android.content.Context;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.util.FloatProperty;

import android.widget.Button;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Flags;

import com.android.launcher3.R;

import com.android.launcher3.statemanager.StatefulActivity;

import com.android.quickstep.orientation.RecentsPagedOrientationHandler;

import com.android.quickstep.util.BorderAnimator;



import kotlin.Unit;



public class ClearAllButton extends Button {
@@ -71,11 +84,71 @@ public class ClearAllButton extends Button { 
    private float mScrollOffsetPrimary;



    private int mSidePadding;

    private int mOutlinePadding;

    private boolean mBorderEnabled;

    @Nullable

    private final BorderAnimator mFocusBorderAnimator;



    public ClearAllButton(Context context, AttributeSet attrs) {

        super(context, attrs);

        mIsRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;

        mActivity = StatefulActivity.fromContext(context);



        if (Flags.enableFocusOutline()) {

            TypedArray styledAttrs = context.obtainStyledAttributes(attrs,

                    R.styleable.ClearAllButton);

            Resources resources = getResources();

            mOutlinePadding = resources.getDimensionPixelSize(

                    R.dimen.recents_clear_all_outline_padding);

            mFocusBorderAnimator =

                    BorderAnimator.createSimpleBorderAnimator(

                            /* borderRadiusPx= */ resources.getDimensionPixelSize(

                                    R.dimen.recents_clear_all_outline_radius),

                            /* borderWidthPx= */ context.getResources().getDimensionPixelSize(

                                    R.dimen.keyboard_quick_switch_border_width),

                            /* boundsBuilder= */ this::updateBorderBounds,

                            /* targetView= */ this,

                            /* borderColor= */ styledAttrs.getColor(

                                    R.styleable.ClearAllButton_focusBorderColor,

                                    DEFAULT_BORDER_COLOR));

            styledAttrs.recycle();

        } else {

            mFocusBorderAnimator = null;

        }

    }



    private Unit updateBorderBounds(@NonNull Rect bounds) {

        bounds.set(0, 0, getWidth(), getHeight());

        // Make the value negative to form a padding between button and outline

        bounds.inset(-mOutlinePadding, -mOutlinePadding);

        return Unit.INSTANCE;

    }



    @Override

    public void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {

        super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);

        if (mFocusBorderAnimator != null && mBorderEnabled) {

            mFocusBorderAnimator.setBorderVisibility(gainFocus, /* animated= */ true);

        }

    }



    /**

     * Enable or disable showing border on focus change

     */

    public void setBorderEnabled(boolean enabled) {

        mBorderEnabled = enabled;

        if (mFocusBorderAnimator != null) {

            mFocusBorderAnimator.setBorderVisibility(/* visible= */

                    enabled && isFocused(), /* animated= */true);

        }

    }



    @Override

    public void draw(Canvas canvas) {

        if (mFocusBorderAnimator != null) {

            mFocusBorderAnimator.drawBorder(canvas);

        }

        super.draw(canvas);

    }



    @Override