Adding an empty page in Recents view corresponding to workspace
The page is aligned to the workspace card and shows a widgets button
in the empty region
Change-Id: I479c47a2fbac4b3ef1aaf833d9fe82b5d7e10ddc
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 79a34a0..01b6ca9 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -106,7 +106,7 @@
final PreviewBackground mFolderLeaveBehind = new PreviewBackground();
private static final int[] BACKGROUND_STATE_ACTIVE = new int[] { android.R.attr.state_active };
- private static final int[] BACKGROUND_STATE_DEFAULT = new int[0];
+ private static final int[] BACKGROUND_STATE_DEFAULT = EMPTY_STATE_SET;
private final Drawable mBackground;
// These values allow a fixed measurement to be set on the CellLayout.
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index d6b5656..5ed722c 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -106,7 +106,7 @@
protected LauncherScroller mScroller;
private Interpolator mDefaultInterpolator;
private VelocityTracker mVelocityTracker;
- @Thunk int mPageSpacing = 0;
+ protected int mPageSpacing = 0;
private float mParentDownMotionX;
private float mParentDownMotionY;
diff --git a/src/com/android/launcher3/views/AllAppsScrim.java b/src/com/android/launcher3/views/AllAppsScrim.java
index 1ada251..d1354ad 100644
--- a/src/com/android/launcher3/views/AllAppsScrim.java
+++ b/src/com/android/launcher3/views/AllAppsScrim.java
@@ -20,8 +20,6 @@
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.RectF;
import android.support.v4.graphics.ColorUtils;
import android.util.AttributeSet;
import android.view.View;
@@ -41,7 +39,7 @@
private static final int MIN_ALPHA_PORTRAIT = 100;
private static final int MIN_ALPHA_LANDSCAPE = MAX_ALPHA;
- private final WallpaperColorInfo mWallpaperColorInfo;
+ protected final WallpaperColorInfo mWallpaperColorInfo;
private final Paint mFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
private final float mRadius;
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 7fa5ff0..6a9013d 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -57,7 +57,7 @@
mInsets = new Rect();
mGradientView = (GradientView) mLauncher.getLayoutInflater().inflate(
- R.layout.gradient_bg, mLauncher.getDragLayer(), false);
+ R.layout.widgets_bottom_sheet_scrim, mLauncher.getDragLayer(), false);
mGradientView.setProgress(1, false);
mContent = this;
}