aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Re-land "Add hover state border to overview task item"" into udc-qpr-dev am: 1d383a7f41

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

Change-Id: I90642b81767ed9a9eeb9f628b7c6f223f6af735e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Helen Cheuk
2023-07-20 22:39:05 +00:00
committed by Automerger Merge Worker
parent 8743e327c9 1d383a7f41
commit 998ab43d99
10 changed files with 85 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/res/layout-land/keyboard_quick_switch_taskview.xml
View File

@@ -23,7 +23,7 @@
android:importantForAccessibility="yes"
android:background="@drawable/keyboard_quick_switch_task_view_background"
android:clipToOutline="true"
launcher:borderColor="?androidprv:attr/materialColorOutline">
launcher:focusBorderColor="?androidprv:attr/materialColorOutline">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content"

2
quickstep/res/layout/keyboard_quick_switch_overview.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="@dimen/keyboard_quick_switch_taskview_height"
android:clipToOutline="true"
android:importantForAccessibility="yes"
launcher:borderColor="?androidprv:attr/materialColorOutline">
launcher:focusBorderColor="?androidprv:attr/materialColorOutline">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content"

2
quickstep/res/layout/keyboard_quick_switch_taskview.xml
View File

@@ -23,7 +23,7 @@
android:importantForAccessibility="yes"
android:background="@drawable/keyboard_quick_switch_task_view_background"
android:clipToOutline="true"
launcher:borderColor="?androidprv:attr/materialColorOutline">
launcher:focusBorderColor="?androidprv:attr/materialColorOutline">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content"

3
quickstep/res/layout/task.xml
View File

@@ -24,7 +24,8 @@
android:clipChildren="false"
android:defaultFocusHighlightEnabled="false"
android:focusable="true"
launcher:borderColor="?androidprv:attr/materialColorOutline">
launcher:focusBorderColor="?androidprv:attr/materialColorOutline"
launcher:hoverBorderColor="?androidprv:attr/materialColorPrimary">
<com.android.quickstep.views.TaskThumbnailView
android:id="@+id/snapshot"

3
quickstep/res/layout/task_desktop.xml
View File

@@ -25,7 +25,8 @@
android:clipToOutline="true"
android:defaultFocusHighlightEnabled="false"
android:focusable="true"
launcher:borderColor="?androidprv:attr/materialColorOutline">
launcher:focusBorderColor="?androidprv:attr/materialColorOutline"
launcher:hoverBorderColor="?androidprv:attr/materialColorPrimary">
<View
android:id="@+id/background"

3
quickstep/res/layout/task_grouped.xml
View File

@@ -29,7 +29,8 @@
android:clipChildren="false"
android:defaultFocusHighlightEnabled="false"
android:focusable="true"
launcher:borderColor="?androidprv:attr/materialColorOutline">
launcher:focusBorderColor="?androidprv:attr/materialColorOutline"
launcher:hoverBorderColor="?androidprv:attr/materialColorPrimary">
<com.android.quickstep.views.TaskThumbnailView
android:id="@+id/snapshot"

3
quickstep/res/values/attrs.xml
View File

@@ -26,7 +26,8 @@
-->
<declare-styleable name="TaskView">
<!-- Border color for a keyboard quick switch task views -->
<attr name="borderColor" format="color" />
<attr name="focusBorderColor" format="color" />
<attr name="hoverBorderColor" format="color" />
</declare-styleable>
<!--

2
quickstep/res/values/dimens.xml
View File

@@ -38,6 +38,8 @@
<dimen name="task_thumbnail_icon_size">48dp</dimen>
<!-- The icon size for the focused task, placed in center of touch target -->
<dimen name="task_thumbnail_icon_drawable_size">44dp</dimen>
<!-- The border width shown when task is hovered -->
<dimen name="task_hover_border_width">4dp</dimen>
<!-- The space under the focused task icon -->
<dimen name="overview_task_margin">16dp</dimen>
<!-- The horizontal space between tasks -->

2
quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchTaskView.java
View File

@@ -80,7 +80,7 @@ public class KeyboardQuickSwitchTaskView extends ConstraintLayout {
setWillNotDraw(false);
mBorderColor = ta.getColor(
R.styleable.TaskView_borderColor, DEFAULT_BORDER_COLOR);
R.styleable.TaskView_focusBorderColor, DEFAULT_BORDER_COLOR);
ta.recycle();
}

92
quickstep/src/com/android/quickstep/views/TaskView.java
View File

@@ -97,7 +97,6 @@ import com.android.quickstep.RemoteAnimationTargets;
import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle;
import com.android.quickstep.TaskAnimationManager;
import com.android.quickstep.TaskIconCache;
import com.android.quickstep.TaskOverlayFactory;
import com.android.quickstep.TaskThumbnailCache;
import com.android.quickstep.TaskUtils;
import com.android.quickstep.TaskViewUtils;
@@ -413,7 +412,9 @@ public class TaskView extends FrameLayout implements Reusable {
private boolean mIsClickableAsLiveTile = true;
@Nullable private final BorderAnimator mBorderAnimator;
@Nullable private final BorderAnimator mFocusBorderAnimator;
@Nullable private final BorderAnimator mHoverBorderAnimator;
public TaskView(Context context) {
this(context, null);
@@ -439,23 +440,40 @@ public class TaskView extends FrameLayout implements Reusable {
boolean keyboardFocusHighlightEnabled = FeatureFlags.ENABLE_KEYBOARD_QUICK_SWITCH.get()
|| DesktopTaskView.DESKTOP_MODE_SUPPORTED;
setWillNotDraw(!keyboardFocusHighlightEnabled);
boolean willDrawBorder =
keyboardFocusHighlightEnabled || FeatureFlags.ENABLE_CURSOR_HOVER_STATES.get();
setWillNotDraw(!willDrawBorder);
TypedArray ta = context.obtainStyledAttributes(
attrs, R.styleable.TaskView, defStyleAttr, defStyleRes);
if (willDrawBorder) {
TypedArray styledAttrs = context.obtainStyledAttributes(
attrs, R.styleable.TaskView, defStyleAttr, defStyleRes);
mBorderAnimator = !keyboardFocusHighlightEnabled
? null
: new BorderAnimator(
/* borderRadiusPx= */ (int) mCurrentFullscreenParams.mCornerRadius,
/* borderColor= */ ta.getColor(
R.styleable.TaskView_borderColor, DEFAULT_BORDER_COLOR),
/* borderAnimationParams= */ new BorderAnimator.SimpleParams(
/* borderWidthPx= */ context.getResources().getDimensionPixelSize(
R.dimen.keyboard_quick_switch_border_width),
/* boundsBuilder= */ this::updateBorderBounds,
/* targetView= */ this));
ta.recycle();
mFocusBorderAnimator = keyboardFocusHighlightEnabled ? new BorderAnimator(
/* borderRadiusPx= */ (int) mCurrentFullscreenParams.mCornerRadius,
/* borderColor= */ styledAttrs.getColor(
R.styleable.TaskView_focusBorderColor, DEFAULT_BORDER_COLOR),
/* borderAnimationParams= */ new BorderAnimator.SimpleParams(
/* borderWidthPx= */ context.getResources().getDimensionPixelSize(
R.dimen.keyboard_quick_switch_border_width),
/* boundsBuilder= */ this::updateBorderBounds,
/* targetView= */ this)) : null;
mHoverBorderAnimator =
FeatureFlags.ENABLE_CURSOR_HOVER_STATES.get() ? new BorderAnimator(
/* borderRadiusPx= */ (int) mCurrentFullscreenParams.mCornerRadius,
/* borderColor= */ styledAttrs.getColor(
R.styleable.TaskView_hoverBorderColor, DEFAULT_BORDER_COLOR),
/* borderAnimationParams= */ new BorderAnimator.SimpleParams(
/* borderWidthPx= */ context.getResources()
.getDimensionPixelSize(R.dimen.task_hover_border_width),
/* boundsBuilder= */ this::updateBorderBounds,
/* targetView= */ this)) : null;
styledAttrs.recycle();
} else {
mFocusBorderAnimator = null;
mHoverBorderAnimator = null;
}
}
protected void updateBorderBounds(Rect bounds) {
@@ -509,16 +527,48 @@ public class TaskView extends FrameLayout implements Reusable {
@Override
protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
if (mBorderAnimator != null) {
mBorderAnimator.buildAnimator(gainFocus).start();
if (mFocusBorderAnimator != null) {
mFocusBorderAnimator.buildAnimator(gainFocus).start();
}
}
@Override
public boolean onHoverEvent(MotionEvent event) {
if (FeatureFlags.ENABLE_CURSOR_HOVER_STATES.get()) {
switch (event.getAction()) {
case MotionEvent.ACTION_HOVER_ENTER:
mHoverBorderAnimator.buildAnimator(/* isAppearing= */ true).start();
break;
case MotionEvent.ACTION_HOVER_EXIT:
mHoverBorderAnimator.buildAnimator(/* isAppearing= */ false).start();
break;
default:
break;
}
}
return super.onHoverEvent(event);
}
@Override
public boolean onInterceptHoverEvent(MotionEvent event) {
if (FeatureFlags.ENABLE_CURSOR_HOVER_STATES.get()) {
// avoid triggering hover event on child elements which would cause HOVER_EXIT for this
// task view
return true;
} else {
return super.onInterceptHoverEvent(event);
}
}
@Override
public void draw(Canvas canvas) {
super.draw(canvas);
if (mBorderAnimator != null) {
mBorderAnimator.drawBorder(canvas);
if (mFocusBorderAnimator != null) {
mFocusBorderAnimator.drawBorder(canvas);
}
if (mHoverBorderAnimator != null) {
mHoverBorderAnimator.drawBorder(canvas);
}
}