aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issue where overview->normal workspace mode cannot be done by tapping b/31458165

Browse Source 
am: f99370c2a9

Change-Id: Id5c7b068fae21a2c4941390bf99db413581ede44
This commit is contained in:
Hyunyoung Song
2016-09-16 19:45:06 +00:00
committed by android-build-merger
parent 5e4d87bec2 f99370c2a9
commit cbf371cddc
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/launcher3/Workspace.java
View File

@@ -593,18 +593,31 @@ public class Workspace extends PagedView
}
// Add the first page
CellLayout firstPage = insertNewWorkspaceScreen(Workspace.FIRST_SCREEN_ID, 0);
final VerticalFlingDetector detector = new VerticalFlingDetector(mLauncher){
@Override
public boolean onTouch(View v, MotionEvent ev) {
if (shouldConsumeTouch(v)) return true;
if (super.onTouch(v, ev)) {
mLauncher.startSearch("", false, null, false);
if (FeatureFlags.PULLDOWN_SEARCH) {
firstPage.setOnTouchListener(new VerticalFlingDetector(mLauncher) {
// detect fling when touch started from empty space
@Override
public boolean onTouch(View v, MotionEvent ev) {
if (workspaceInModalState()) return false;
if (shouldConsumeTouch(v)) return true;
if (super.onTouch(v, ev)) {
mLauncher.startSearch("", false, null, false);
}
return false;
}
return false;
}
};
firstPage.setOnTouchListener(detector);
firstPage.setOnInterceptTouchListener(detector);
});
firstPage.setOnInterceptTouchListener(new VerticalFlingDetector(mLauncher) {
// detect fling when touch started from on top of the icons
@Override
public boolean onTouch(View v, MotionEvent ev) {
if (shouldConsumeTouch(v)) return true;
if (super.onTouch(v, ev)) {
mLauncher.startSearch("", false, null, false);
}
return false;
}
});
}
// Always add a QSB on the first screen.
if (qsb == null) {
// In transposed layout, we add the QSB in the Grid. As workspace does not touch the