The swiping up gesture will never return an app in All Apps,
so we can ignore All Apps state in those cases.
This fixes an edge case where user swipes up and launcher state
is still in All Apps. This causes us to animate the icon to
where it would be in All Apps, even though by the time the
animation starts we are actually in Normal state.
Bug: 222124240
Test: open app from all apps then quickly swipe up to go home
Change-Id: I756a870660a397d6629aec82e4f5ec4914ed0669
(cherry picked from commit b42e124f5b)
240 lines
7.7 KiB
Java
240 lines
7.7 KiB
Java
/*
|
|
* Copyright (C) 2020 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.views;
|
|
|
|
import static com.android.launcher3.views.FloatingIconView.getLocationBoundsForView;
|
|
import static com.android.launcher3.views.IconLabelDotView.setIconAndDotVisible;
|
|
|
|
import android.annotation.TargetApi;
|
|
import android.content.Context;
|
|
import android.graphics.Canvas;
|
|
import android.graphics.Picture;
|
|
import android.graphics.PixelFormat;
|
|
import android.graphics.Rect;
|
|
import android.graphics.RectF;
|
|
import android.os.Build;
|
|
import android.util.AttributeSet;
|
|
import android.view.MotionEvent;
|
|
import android.view.SurfaceHolder;
|
|
import android.view.SurfaceView;
|
|
import android.view.View;
|
|
import android.view.ViewTreeObserver.OnGlobalLayoutListener;
|
|
|
|
import androidx.annotation.NonNull;
|
|
|
|
import com.android.launcher3.AbstractFloatingView;
|
|
import com.android.launcher3.GestureNavContract;
|
|
import com.android.launcher3.Insettable;
|
|
import com.android.launcher3.Launcher;
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.util.DisplayController;
|
|
import com.android.launcher3.util.Executors;
|
|
|
|
/**
|
|
* Similar to {@link FloatingIconView} but displays a surface with the targetIcon. It then passes
|
|
* the surfaceHandle to the {@link GestureNavContract}.
|
|
*/
|
|
@TargetApi(Build.VERSION_CODES.R)
|
|
public class FloatingSurfaceView extends AbstractFloatingView implements
|
|
OnGlobalLayoutListener, Insettable, SurfaceHolder.Callback2 {
|
|
|
|
private final RectF mTmpPosition = new RectF();
|
|
|
|
private final Launcher mLauncher;
|
|
private final RectF mIconPosition = new RectF();
|
|
|
|
private final Rect mIconBounds = new Rect();
|
|
private final Picture mPicture = new Picture();
|
|
private final Runnable mRemoveViewRunnable = this::removeViewFromParent;
|
|
|
|
private final SurfaceView mSurfaceView;
|
|
|
|
|
|
private View mIcon;
|
|
private GestureNavContract mContract;
|
|
|
|
public FloatingSurfaceView(Context context) {
|
|
this(context, null);
|
|
}
|
|
|
|
public FloatingSurfaceView(Context context, AttributeSet attrs) {
|
|
this(context, attrs, 0);
|
|
}
|
|
|
|
public FloatingSurfaceView(Context context, AttributeSet attrs, int defStyleAttr) {
|
|
super(context, attrs, defStyleAttr);
|
|
mLauncher = Launcher.getLauncher(context);
|
|
|
|
mSurfaceView = new SurfaceView(context);
|
|
mSurfaceView.setZOrderOnTop(true);
|
|
|
|
mSurfaceView.getHolder().setFormat(PixelFormat.TRANSLUCENT);
|
|
mSurfaceView.getHolder().addCallback(this);
|
|
mIsOpen = true;
|
|
addView(mSurfaceView);
|
|
}
|
|
|
|
@Override
|
|
protected void handleClose(boolean animate) {
|
|
setCurrentIconVisible(true);
|
|
mLauncher.getViewCache().recycleView(R.layout.floating_surface_view, this);
|
|
mContract = null;
|
|
mIcon = null;
|
|
mIsOpen = false;
|
|
|
|
// Remove after some time, to avoid flickering
|
|
Executors.MAIN_EXECUTOR.getHandler().postDelayed(mRemoveViewRunnable,
|
|
DisplayController.INSTANCE.get(mLauncher).getInfo().singleFrameMs);
|
|
}
|
|
|
|
private void removeViewFromParent() {
|
|
mPicture.beginRecording(1, 1);
|
|
mPicture.endRecording();
|
|
mLauncher.getDragLayer().removeView(this);
|
|
}
|
|
|
|
/**
|
|
* Shows the surfaceView for the provided contract
|
|
*/
|
|
public static void show(Launcher launcher, GestureNavContract contract) {
|
|
FloatingSurfaceView view = launcher.getViewCache().getView(R.layout.floating_surface_view,
|
|
launcher, launcher.getDragLayer());
|
|
view.mContract = contract;
|
|
view.mIsOpen = true;
|
|
|
|
// Cancel any pending remove
|
|
Executors.MAIN_EXECUTOR.getHandler().removeCallbacks(view.mRemoveViewRunnable);
|
|
view.removeViewFromParent();
|
|
launcher.getDragLayer().addView(view);
|
|
}
|
|
|
|
@Override
|
|
protected boolean isOfType(int type) {
|
|
return (type & TYPE_ICON_SURFACE) != 0;
|
|
}
|
|
|
|
@Override
|
|
public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
|
|
close(false);
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
protected void onAttachedToWindow() {
|
|
super.onAttachedToWindow();
|
|
getViewTreeObserver().addOnGlobalLayoutListener(this);
|
|
updateIconLocation();
|
|
}
|
|
|
|
@Override
|
|
protected void onDetachedFromWindow() {
|
|
super.onDetachedFromWindow();
|
|
getViewTreeObserver().removeOnGlobalLayoutListener(this);
|
|
setCurrentIconVisible(true);
|
|
}
|
|
|
|
@Override
|
|
public void onGlobalLayout() {
|
|
updateIconLocation();
|
|
}
|
|
|
|
@Override
|
|
public void setInsets(Rect insets) { }
|
|
|
|
private void updateIconLocation() {
|
|
if (mContract == null) {
|
|
return;
|
|
}
|
|
View icon = mLauncher.getFirstMatchForAppClose(-1,
|
|
mContract.componentName.getPackageName(), mContract.user,
|
|
false /* supportsAllAppsState */);
|
|
|
|
boolean iconChanged = mIcon != icon;
|
|
if (iconChanged) {
|
|
setCurrentIconVisible(true);
|
|
mIcon = icon;
|
|
setCurrentIconVisible(false);
|
|
}
|
|
|
|
if (icon != null && icon.isAttachedToWindow()) {
|
|
getLocationBoundsForView(mLauncher, icon, false, mTmpPosition, mIconBounds);
|
|
|
|
if (!mTmpPosition.equals(mIconPosition)) {
|
|
mIconPosition.set(mTmpPosition);
|
|
sendIconInfo();
|
|
|
|
LayoutParams lp = (LayoutParams) mSurfaceView.getLayoutParams();
|
|
lp.width = Math.round(mIconPosition.width());
|
|
lp.height = Math.round(mIconPosition.height());
|
|
lp.leftMargin = Math.round(mIconPosition.left);
|
|
lp.topMargin = Math.round(mIconPosition.top);
|
|
}
|
|
}
|
|
if (mIcon != null && iconChanged && !mIconBounds.isEmpty()) {
|
|
// Record the icon display
|
|
setCurrentIconVisible(true);
|
|
Canvas c = mPicture.beginRecording(mIconBounds.width(), mIconBounds.height());
|
|
c.translate(-mIconBounds.left, -mIconBounds.top);
|
|
mIcon.draw(c);
|
|
mPicture.endRecording();
|
|
setCurrentIconVisible(false);
|
|
drawOnSurface();
|
|
}
|
|
}
|
|
|
|
private void sendIconInfo() {
|
|
if (mContract != null && !mIconPosition.isEmpty()) {
|
|
mContract.sendEndPosition(mIconPosition, mSurfaceView.getSurfaceControl());
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void surfaceCreated(@NonNull SurfaceHolder surfaceHolder) {
|
|
drawOnSurface();
|
|
sendIconInfo();
|
|
}
|
|
|
|
@Override
|
|
public void surfaceChanged(@NonNull SurfaceHolder surfaceHolder,
|
|
int format, int width, int height) {
|
|
drawOnSurface();
|
|
}
|
|
|
|
@Override
|
|
public void surfaceDestroyed(@NonNull SurfaceHolder surfaceHolder) {}
|
|
|
|
@Override
|
|
public void surfaceRedrawNeeded(@NonNull SurfaceHolder surfaceHolder) {
|
|
drawOnSurface();
|
|
}
|
|
|
|
private void drawOnSurface() {
|
|
SurfaceHolder surfaceHolder = mSurfaceView.getHolder();
|
|
|
|
Canvas c = surfaceHolder.lockHardwareCanvas();
|
|
if (c != null) {
|
|
mPicture.draw(c);
|
|
surfaceHolder.unlockCanvasAndPost(c);
|
|
}
|
|
}
|
|
|
|
private void setCurrentIconVisible(boolean isVisible) {
|
|
if (mIcon != null) {
|
|
setIconAndDotVisible(mIcon, isVisible);
|
|
}
|
|
}
|
|
}
|