Merge "Removing some dead code in paged view" into ub-launcher3-burnaby
This commit is contained in:
commit
067e5e0177
5 files changed
+66
-707
No files matched your search
@@ -95,7 +95,6 @@ public class Workspace extends SmoothPagedView
|
||||
protected static final int FADE_EMPTY_SCREEN_DURATION = 150;
|
||||
|
||||
private static final int ADJACENT_SCREEN_DROP_DURATION = 300;
|
||||
private static final int FLING_THRESHOLD_VELOCITY = 500;
|
||||
|
||||
static final boolean MAP_NO_RECURSE = false;
|
||||
static final boolean MAP_RECURSE = true;
|
||||
@@ -306,13 +305,11 @@ public class Workspace extends SmoothPagedView
|
||||
*/
|
||||
public Workspace(Context context, AttributeSet attrs, int defStyle) {
|
||||
super(context, attrs, defStyle);
|
||||
mContentIsRefreshable = false;
|
||||
|
||||
mOutlineHelper = HolographicOutlineHelper.obtain(context);
|
||||
|
||||
mDragEnforcer = new DropTarget.DragEnforcer(context);
|
||||
// With workspace, data is available straight from the get-go
|
||||
setDataIsReady();
|
||||
|
||||
mLauncher = (Launcher) context;
|
||||
mStateTransitionAnimation = new WorkspaceStateTransitionAnimation(mLauncher, this);
|
||||
@@ -448,7 +445,6 @@ public class Workspace extends SmoothPagedView
|
||||
display.getSize(mDisplaySize);
|
||||
|
||||
mMaxDistanceForFolderCreation = (0.55f * grid.iconSizePx);
|
||||
mFlingThresholdVelocity = (int) (FLING_THRESHOLD_VELOCITY * mDensity);
|
||||
|
||||
// Set the wallpaper dimensions when Launcher starts up
|
||||
setWallpaperDimension();
|
||||
@@ -4483,14 +4479,6 @@ public class Workspace extends SmoothPagedView
|
||||
return super.getPageIndicatorMarker(pageIndex);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void syncPages() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void syncPageItems(int page, boolean immediate) {
|
||||
}
|
||||
|
||||
protected String getPageIndicatorDescription() {
|
||||
String settings = getResources().getString(R.string.settings_button_text);
|
||||
return getCurrentPageDescription() + ", " + settings;
|
||||
|
||||
Reference in new issue
Block a user