Andras Kloczl
8e57cce4ee
- Pagespacing set to 0 to have similar design to figma - Added padding to left side of left panel and right side of right panel to match figma - getPageScrolls changed to support two page scrolling - validateNewPage changed so that only even indexed pages can be switched to - getPageWidthSize added for measurements, it returns half screen width when two panel is active - onMeasure changed to use getPageWidthSize - panelCount has been increased from 1 to 2 when two panel is active - add feature flag for two panel home - shouldConsumeTouch changed so not only currentpage is checked but currentpage+1 screen as well - add one more extra check for setDropLayoutForDragObject for currentpage + 2, next to right panel - using new grid option for two panel home screen Test: manual Bug: 174464115 Change-Id: I1bad7eecc67f65fb833608744a5aa5aca65373b4
67 lines
2.2 KiB
Java
67 lines
2.2 KiB
Java
/*
|
|
* Copyright (C) 2010 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 com.android.launcher3.Alarm;
|
|
import com.android.launcher3.CellLayout;
|
|
import com.android.launcher3.Launcher;
|
|
import com.android.launcher3.OnAlarmListener;
|
|
import com.android.launcher3.Workspace;
|
|
|
|
public class SpringLoadedDragController implements OnAlarmListener {
|
|
// how long the user must hover over a mini-screen before it unshrinks
|
|
final long ENTER_SPRING_LOAD_HOVER_TIME = 500;
|
|
final long ENTER_SPRING_LOAD_CANCEL_HOVER_TIME = 950;
|
|
|
|
Alarm mAlarm;
|
|
|
|
// the screen the user is currently hovering over, if any
|
|
private CellLayout mScreen;
|
|
private Launcher mLauncher;
|
|
|
|
public SpringLoadedDragController(Launcher launcher) {
|
|
mLauncher = launcher;
|
|
mAlarm = new Alarm();
|
|
mAlarm.setOnAlarmListener(this);
|
|
}
|
|
|
|
public void cancel() {
|
|
mAlarm.cancelAlarm();
|
|
}
|
|
|
|
// Set a new alarm to expire for the screen that we are hovering over now
|
|
public void setAlarm(CellLayout cl) {
|
|
mAlarm.cancelAlarm();
|
|
mAlarm.setAlarm((cl == null) ? ENTER_SPRING_LOAD_CANCEL_HOVER_TIME :
|
|
ENTER_SPRING_LOAD_HOVER_TIME);
|
|
mScreen = cl;
|
|
}
|
|
|
|
// this is called when our timer runs out
|
|
public void onAlarm(Alarm alarm) {
|
|
if (mScreen != null) {
|
|
// Snap to the screen that we are hovering over now
|
|
Workspace w = mLauncher.getWorkspace();
|
|
if (!w.isVisible(mScreen)) {
|
|
w.snapToPage(w.indexOfChild(mScreen));
|
|
}
|
|
} else {
|
|
mLauncher.getDragController().cancelDrag();
|
|
}
|
|
}
|
|
}
|