7dee27f470
1. if a 'ViewScaleTargetProvider' is being used, this can cause a crash 2. otherwise, the old border bounds are reapplied, which is likely no longer correct Updated BorderAnimator to use 'BorderAnimationParams' rather than 'ViewScaleTargetProvider'. This removes some unnecessary null checks while making the util class simpler to use. It also allows us to listen for specific view events for the border animation. Flag: ENABLE_KEYBOARD_QUICK_SWITCH Fixes: 283272516 Test: opened the keyboard quick switch view and highlighted a view in recents view, then rotated the screen several times Change-Id: I7959d6cd892ebcdd2c68163dd56c358815494af6
207 lines
7.1 KiB
Java
207 lines
7.1 KiB
Java
/*
|
|
* Copyright (C) 2023 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package com.android.launcher3.taskbar;
|
|
|
|
import static com.android.quickstep.util.BorderAnimator.DEFAULT_BORDER_COLOR;
|
|
|
|
import android.animation.Animator;
|
|
import android.content.Context;
|
|
import android.content.res.Resources;
|
|
import android.content.res.TypedArray;
|
|
import android.graphics.Bitmap;
|
|
import android.graphics.Canvas;
|
|
import android.util.AttributeSet;
|
|
import android.view.View;
|
|
import android.widget.ImageView;
|
|
|
|
import androidx.annotation.ColorInt;
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.Nullable;
|
|
import androidx.constraintlayout.widget.ConstraintLayout;
|
|
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.util.Preconditions;
|
|
import com.android.quickstep.util.BorderAnimator;
|
|
import com.android.systemui.shared.recents.model.Task;
|
|
import com.android.systemui.shared.recents.model.ThumbnailData;
|
|
|
|
import java.util.function.Consumer;
|
|
|
|
/**
|
|
* A view that displays a recent task during a keyboard quick switch.
|
|
*/
|
|
public class KeyboardQuickSwitchTaskView extends ConstraintLayout {
|
|
|
|
@ColorInt private final int mBorderColor;
|
|
|
|
@Nullable private BorderAnimator mBorderAnimator;
|
|
|
|
@Nullable private ImageView mThumbnailView1;
|
|
@Nullable private ImageView mThumbnailView2;
|
|
@Nullable private ImageView mIcon1;
|
|
@Nullable private ImageView mIcon2;
|
|
@Nullable private View mContent;
|
|
|
|
public KeyboardQuickSwitchTaskView(@NonNull Context context) {
|
|
this(context, null);
|
|
}
|
|
|
|
public KeyboardQuickSwitchTaskView(@NonNull Context context, @Nullable AttributeSet attrs) {
|
|
this(context, attrs, 0);
|
|
}
|
|
|
|
public KeyboardQuickSwitchTaskView(
|
|
@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
|
|
this(context, attrs, defStyleAttr, 0);
|
|
}
|
|
|
|
public KeyboardQuickSwitchTaskView(
|
|
@NonNull Context context,
|
|
@Nullable AttributeSet attrs,
|
|
int defStyleAttr,
|
|
int defStyleRes) {
|
|
super(context, attrs, defStyleAttr, defStyleRes);
|
|
TypedArray ta = context.obtainStyledAttributes(
|
|
attrs, R.styleable.TaskView, defStyleAttr, defStyleRes);
|
|
|
|
setWillNotDraw(false);
|
|
|
|
mBorderColor = ta.getColor(
|
|
R.styleable.TaskView_borderColor, DEFAULT_BORDER_COLOR);
|
|
ta.recycle();
|
|
}
|
|
|
|
@Override
|
|
protected void onFinishInflate() {
|
|
super.onFinishInflate();
|
|
mThumbnailView1 = findViewById(R.id.thumbnail1);
|
|
mThumbnailView2 = findViewById(R.id.thumbnail2);
|
|
mIcon1 = findViewById(R.id.icon1);
|
|
mIcon2 = findViewById(R.id.icon2);
|
|
mContent = findViewById(R.id.content);
|
|
|
|
Resources resources = mContext.getResources();
|
|
|
|
Preconditions.assertNotNull(mContent);
|
|
mBorderAnimator = new BorderAnimator(
|
|
/* borderRadiusPx= */ resources.getDimensionPixelSize(
|
|
R.dimen.keyboard_quick_switch_task_view_radius),
|
|
/* borderColor= */ mBorderColor,
|
|
/* borderAnimationParams= */ new BorderAnimator.ScalingParams(
|
|
/* borderWidthPx= */ resources.getDimensionPixelSize(
|
|
R.dimen.keyboard_quick_switch_border_width),
|
|
/* boundsBuilder= */ bounds -> bounds.set(
|
|
0, 0, getWidth(), getHeight()),
|
|
/* targetView= */ this,
|
|
/* contentView= */ mContent));
|
|
}
|
|
|
|
@Nullable
|
|
protected Animator getFocusAnimator(boolean focused) {
|
|
return mBorderAnimator == null ? null : mBorderAnimator.buildAnimator(focused);
|
|
}
|
|
|
|
@Override
|
|
public void draw(Canvas canvas) {
|
|
super.draw(canvas);
|
|
if (mBorderAnimator != null) {
|
|
mBorderAnimator.drawBorder(canvas);
|
|
}
|
|
}
|
|
|
|
protected void setThumbnails(
|
|
@NonNull Task task1,
|
|
@Nullable Task task2,
|
|
@Nullable ThumbnailUpdateFunction thumbnailUpdateFunction,
|
|
@Nullable IconUpdateFunction iconUpdateFunction) {
|
|
applyThumbnail(mThumbnailView1, task1, thumbnailUpdateFunction);
|
|
applyThumbnail(mThumbnailView2, task2, thumbnailUpdateFunction);
|
|
|
|
if (iconUpdateFunction == null) {
|
|
applyIcon(mIcon1, task1);
|
|
applyIcon(mIcon2, task2);
|
|
setContentDescription(task2 == null
|
|
? task1.titleDescription
|
|
: getContext().getString(
|
|
R.string.quick_switch_split_task,
|
|
task1.titleDescription,
|
|
task2.titleDescription));
|
|
return;
|
|
}
|
|
iconUpdateFunction.updateIconInBackground(task1, t -> {
|
|
applyIcon(mIcon1, task1);
|
|
if (task2 != null) {
|
|
return;
|
|
}
|
|
setContentDescription(task1.titleDescription);
|
|
});
|
|
if (task2 == null) {
|
|
return;
|
|
}
|
|
iconUpdateFunction.updateIconInBackground(task2, t -> {
|
|
applyIcon(mIcon2, task2);
|
|
setContentDescription(getContext().getString(
|
|
R.string.quick_switch_split_task,
|
|
task1.titleDescription,
|
|
task2.titleDescription));
|
|
});
|
|
}
|
|
|
|
private void applyThumbnail(
|
|
@Nullable ImageView thumbnailView,
|
|
@Nullable Task task,
|
|
@Nullable ThumbnailUpdateFunction updateFunction) {
|
|
if (thumbnailView == null) {
|
|
return;
|
|
}
|
|
if (task == null) {
|
|
return;
|
|
}
|
|
if (updateFunction == null) {
|
|
applyThumbnail(thumbnailView, task.thumbnail);
|
|
return;
|
|
}
|
|
updateFunction.updateThumbnailInBackground(
|
|
task, thumbnailData -> applyThumbnail(thumbnailView, thumbnailData));
|
|
}
|
|
|
|
private void applyThumbnail(
|
|
@NonNull ImageView thumbnailView, ThumbnailData thumbnailData) {
|
|
Bitmap bm = thumbnailData == null ? null : thumbnailData.thumbnail;
|
|
|
|
thumbnailView.setVisibility(VISIBLE);
|
|
thumbnailView.setImageBitmap(bm);
|
|
}
|
|
|
|
private void applyIcon(@Nullable ImageView iconView, @Nullable Task task) {
|
|
if (iconView == null || task == null) {
|
|
return;
|
|
}
|
|
iconView.setVisibility(VISIBLE);
|
|
iconView.setImageDrawable(task.icon);
|
|
}
|
|
|
|
protected interface ThumbnailUpdateFunction {
|
|
|
|
void updateThumbnailInBackground(Task task, Consumer<ThumbnailData> callback);
|
|
}
|
|
|
|
protected interface IconUpdateFunction {
|
|
|
|
void updateIconInBackground(Task task, Consumer<Task> callback);
|
|
}
|
|
}
|