Merge "Remove pulldown search feature flag Bug: 63713013" into ub-launcher3-master
This commit is contained in:
commit
a9c8c4adea
3 files changed
-118
No files matched your search
@@ -84,7 +84,6 @@ import com.android.launcher3.util.ItemInfoMatcher;
|
||||
import com.android.launcher3.util.LongArrayMap;
|
||||
import com.android.launcher3.util.PackageUserKey;
|
||||
import com.android.launcher3.util.Thunk;
|
||||
import com.android.launcher3.util.VerticalFlingDetector;
|
||||
import com.android.launcher3.util.WallpaperOffsetInterpolator;
|
||||
import com.android.launcher3.widget.PendingAddShortcutInfo;
|
||||
import com.android.launcher3.widget.PendingAddWidgetInfo;
|
||||
@@ -571,33 +570,6 @@ public class Workspace extends PagedView
|
||||
}
|
||||
// Add the first page
|
||||
CellLayout firstPage = insertNewWorkspaceScreen(Workspace.FIRST_SCREEN_ID, 0);
|
||||
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 true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
});
|
||||
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 true;
|
||||
}
|
||||
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
|
||||
|
||||
Reference in new issue
Block a user