Charlie Anderson
438d405aab
- Edit Mode doesn't close after dragging / dropping an app - Edit Mode can be entered through options popup menu, Spring Loaded still entered by dragging items - Adds new onLeavingState call to launcher states to cleanup changes Bug: 279590398 Flag: MULTI_SELECT_EDIT_MODE Test: manually tested the new state with flag on/off Change-Id: If4550037f9659dcb8cd8b1943388d1ec5d55fa29
72 lines
2.7 KiB
Java
72 lines
2.7 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.dragndrop;
|
|
|
|
import android.graphics.drawable.Drawable;
|
|
import android.view.View;
|
|
|
|
import com.android.launcher3.Launcher;
|
|
import com.android.launcher3.LauncherState;
|
|
import com.android.launcher3.statemanager.StateManager;
|
|
|
|
/**
|
|
* A DragView drawn/used by the Launcher activity.
|
|
*/
|
|
public class LauncherDragView extends DragView<Launcher>
|
|
implements StateManager.StateListener<LauncherState> {
|
|
|
|
|
|
public LauncherDragView(Launcher launcher, Drawable drawable, int registrationX,
|
|
int registrationY, float initialScale, float scaleOnDrop, float finalScaleDps) {
|
|
super(launcher, drawable, registrationX, registrationY, initialScale, scaleOnDrop,
|
|
finalScaleDps);
|
|
}
|
|
|
|
public LauncherDragView(Launcher launcher, View content, int width, int height,
|
|
int registrationX, int registrationY, float initialScale, float scaleOnDrop,
|
|
float finalScaleDps) {
|
|
super(launcher, content, width, height, registrationX, registrationY, initialScale,
|
|
scaleOnDrop, finalScaleDps);
|
|
}
|
|
|
|
@Override
|
|
protected void onAttachedToWindow() {
|
|
super.onAttachedToWindow();
|
|
mActivity.getStateManager().addStateListener(this);
|
|
}
|
|
|
|
@Override
|
|
protected void onDetachedFromWindow() {
|
|
super.onDetachedFromWindow();
|
|
mActivity.getStateManager().removeStateListener(this);
|
|
}
|
|
|
|
@Override
|
|
public void onStateTransitionComplete(LauncherState finalState) {
|
|
setVisibility((finalState == LauncherState.NORMAL
|
|
|| finalState == LauncherState.SPRING_LOADED
|
|
|| finalState == LauncherState.EDIT_MODE) ? VISIBLE : INVISIBLE);
|
|
}
|
|
|
|
@Override
|
|
public void animateTo(int toTouchX, int toTouchY, Runnable onCompleteRunnable, int duration) {
|
|
mTempLoc[0] = toTouchX - mRegistrationX;
|
|
mTempLoc[1] = toTouchY - mRegistrationY;
|
|
mActivity.getDragLayer().animateViewIntoPosition(this, mTempLoc, 1f, mScaleOnDrop,
|
|
mScaleOnDrop, DragLayer.ANIMATION_END_DISAPPEAR, onCompleteRunnable, duration);
|
|
}
|
|
}
|