- TaskbarDragController now extends DragController. - Currently there is no pre-drag condition, so we immediately get onDragStart(), which starts the system global drag (which cancels the original internal drag). - Make the original view invisible during the drag and drop operation, across both internal and system drag events. - No longer handle onDragEvent() in TaskbarView, as TaskbarDragController handles all of it now. Test: Drag and drop from taskbar still works (bonus: starts from the correct registration point that you touched down on). Locally added a PreDragCondition and verified a seamless handoff to system drag and drop when the pre drag end condition was met. Bug: 182981908 Change-Id: I6bf48141a5eedfc6db6f461258e880ef8146e733
152 lines
5.1 KiB
Java
152 lines
5.1 KiB
Java
/*
|
|
* Copyright (C) 2021 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 android.content.Context;
|
|
import android.graphics.Canvas;
|
|
import android.graphics.Paint;
|
|
import android.graphics.Rect;
|
|
import android.util.AttributeSet;
|
|
import android.view.View;
|
|
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.Nullable;
|
|
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.util.TouchController;
|
|
import com.android.launcher3.views.BaseDragLayer;
|
|
import com.android.systemui.shared.system.ViewTreeObserverWrapper;
|
|
import com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo;
|
|
import com.android.systemui.shared.system.ViewTreeObserverWrapper.OnComputeInsetsListener;
|
|
|
|
/**
|
|
* Top-level ViewGroup that hosts the TaskbarView as well as Views created by it such as Folder.
|
|
*/
|
|
public class TaskbarDragLayer extends BaseDragLayer<TaskbarActivityContext> {
|
|
|
|
private final int mFolderMargin;
|
|
private final Paint mTaskbarBackgroundPaint;
|
|
|
|
private TaskbarIconController.TaskbarDragLayerCallbacks mControllerCallbacks;
|
|
private TaskbarView mTaskbarView;
|
|
|
|
private final OnComputeInsetsListener mTaskbarInsetsComputer = this::onComputeTaskbarInsets;
|
|
|
|
public TaskbarDragLayer(@NonNull Context context) {
|
|
this(context, null);
|
|
}
|
|
|
|
public TaskbarDragLayer(@NonNull Context context, @Nullable AttributeSet attrs) {
|
|
this(context, attrs, 0);
|
|
}
|
|
|
|
public TaskbarDragLayer(@NonNull Context context, @Nullable AttributeSet attrs,
|
|
int defStyleAttr) {
|
|
this(context, attrs, defStyleAttr, 0);
|
|
}
|
|
|
|
public TaskbarDragLayer(@NonNull Context context, @Nullable AttributeSet attrs,
|
|
int defStyleAttr, int defStyleRes) {
|
|
super(context, attrs, 1 /* alphaChannelCount */);
|
|
mFolderMargin = getResources().getDimensionPixelSize(R.dimen.taskbar_folder_margin);
|
|
mTaskbarBackgroundPaint = new Paint();
|
|
mTaskbarBackgroundPaint.setColor(getResources().getColor(R.color.taskbar_background));
|
|
recreateControllers();
|
|
}
|
|
|
|
@Override
|
|
public void recreateControllers() {
|
|
mControllers = new TouchController[] {mActivity.getDragController()};
|
|
}
|
|
|
|
public void init(TaskbarIconController.TaskbarDragLayerCallbacks callbacks,
|
|
TaskbarView taskbarView) {
|
|
mControllerCallbacks = callbacks;
|
|
mTaskbarView = taskbarView;
|
|
}
|
|
|
|
private void onComputeTaskbarInsets(InsetsInfo insetsInfo) {
|
|
if (mControllerCallbacks != null) {
|
|
mControllerCallbacks.updateInsetsTouchability(insetsInfo);
|
|
}
|
|
}
|
|
|
|
protected void onDestroy() {
|
|
ViewTreeObserverWrapper.removeOnComputeInsetsListener(mTaskbarInsetsComputer);
|
|
}
|
|
|
|
@Override
|
|
protected void onAttachedToWindow() {
|
|
super.onAttachedToWindow();
|
|
ViewTreeObserverWrapper.addOnComputeInsetsListener(getViewTreeObserver(),
|
|
mTaskbarInsetsComputer);
|
|
}
|
|
|
|
@Override
|
|
protected void onDetachedFromWindow() {
|
|
super.onDetachedFromWindow();
|
|
|
|
onDestroy();
|
|
}
|
|
|
|
@Override
|
|
protected boolean canFindActiveController() {
|
|
// Unlike super class, we want to be able to find controllers when touches occur in the
|
|
// gesture area. For example, this allows Folder to close itself when touching the Taskbar.
|
|
return true;
|
|
}
|
|
|
|
public void updateImeBarVisibilityAlpha(float alpha) {
|
|
if (mControllerCallbacks != null) {
|
|
mControllerCallbacks.updateImeBarVisibilityAlpha(alpha);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onViewRemoved(View child) {
|
|
super.onViewRemoved(child);
|
|
if (mControllerCallbacks != null) {
|
|
mControllerCallbacks.onDragLayerViewRemoved();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void dispatchDraw(Canvas canvas) {
|
|
canvas.drawRect(0, canvas.getHeight() - mTaskbarView.getHeight(), canvas.getWidth(),
|
|
canvas.getHeight(), mTaskbarBackgroundPaint);
|
|
super.dispatchDraw(canvas);
|
|
}
|
|
|
|
/**
|
|
* @return Bounds (in our coordinates) where an opened Folder can display.
|
|
*/
|
|
protected Rect getFolderBoundingBox() {
|
|
Rect boundingBox = new Rect(0, 0, getWidth(), getHeight() - mTaskbarView.getHeight());
|
|
boundingBox.inset(mFolderMargin, mFolderMargin);
|
|
return boundingBox;
|
|
}
|
|
|
|
|
|
/**
|
|
* Sets the alpha of the background color behind all the Taskbar contents.
|
|
* @param alpha 0 is fully transparent, 1 is fully opaque.
|
|
*/
|
|
protected void setTaskbarBackgroundAlpha(float alpha) {
|
|
mTaskbarBackgroundPaint.setAlpha((int) (alpha * 255));
|
|
invalidate();
|
|
}
|
|
}
|