diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-12-15 13:05:42 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-12-19 10:06:15 -0800 |
| commit | e15e2a8267c677a41bd91eac4d79ee36d467d8d4 (patch) | |
| tree | a831d373ade9d97663f0be442b435a671166096d /src/com/android | |
| parent | 9558a884ddf52a38d471477abbc6b52c853471a9 (diff) | |
| download | packages_apps_Trebuchet-e15e2a8267c677a41bd91eac4d79ee36d467d8d4.tar.gz packages_apps_Trebuchet-e15e2a8267c677a41bd91eac4d79ee36d467d8d4.tar.bz2 packages_apps_Trebuchet-e15e2a8267c677a41bd91eac4d79ee36d467d8d4.zip | |
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
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/views/AllAppsScrim.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetsBottomSheet.java | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 79a34a098..01b6ca987 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -106,7 +106,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { 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 d6b56564e..5ed722c29 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -106,7 +106,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 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 1ada25151..d1354adeb 100644 --- a/src/com/android/launcher3/views/AllAppsScrim.java +++ b/src/com/android/launcher3/views/AllAppsScrim.java @@ -20,8 +20,6 @@ import android.graphics.Bitmap; 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 @@ public class AllAppsScrim extends View implements WallpaperColorInfo.OnChangeLis 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 7fa5ff054..6a9013d7e 100644 --- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java +++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java @@ -57,7 +57,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable { 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; } |