diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-02-28 15:09:36 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-03-01 11:23:46 -0800 |
commit | 6639a5dfe0565f413c78e46c125f55333e8a9111 (patch) | |
tree | 0a209280a098c0ae6995fadea756d1aaa9ca807b /src/com/android/launcher3/widget | |
parent | 43936eb05c8e90264aa8a808c0bafb69abc092b1 (diff) | |
download | android_packages_apps_Trebuchet-6639a5dfe0565f413c78e46c125f55333e8a9111.tar.gz android_packages_apps_Trebuchet-6639a5dfe0565f413c78e46c125f55333e8a9111.tar.bz2 android_packages_apps_Trebuchet-6639a5dfe0565f413c78e46c125f55333e8a9111.zip |
Updating the scrim and landscpae ui
> Instead of views, using a custom class to draw the color scrims
> All-apps has full screen UI
> Quickstep does not have search box in landscape
Bug: 73085356
Change-Id: I360a78a2ade0134daad29fe712796cd39a381fbb
Diffstat (limited to 'src/com/android/launcher3/widget')
3 files changed, 10 insertions, 32 deletions
diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java index b22509ce3..c51842d0d 100644 --- a/src/com/android/launcher3/widget/BaseWidgetSheet.java +++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java @@ -31,7 +31,7 @@ import com.android.launcher3.ItemInfo; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.dragndrop.DragOptions; -import com.android.launcher3.graphics.GradientView; +import com.android.launcher3.graphics.ColorScrim; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; import com.android.launcher3.userevent.nano.LauncherLogProto.Target; import com.android.launcher3.util.SystemUiController; @@ -48,10 +48,11 @@ abstract class BaseWidgetSheet extends AbstractSlideInView /* Touch handling related member variables. */ private Toast mWidgetInstructionToast; - protected GradientView mGradientView; + protected final ColorScrim mColorScrim; public BaseWidgetSheet(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); + mColorScrim = ColorScrim.createExtractedColorScrim(this); } @Override @@ -80,7 +81,7 @@ abstract class BaseWidgetSheet extends AbstractSlideInView protected void setTranslationShift(float translationShift) { super.setTranslationShift(translationShift); - mGradientView.setAlpha(1 - mTranslationShift); + mColorScrim.setProgress(1 - mTranslationShift); } private boolean beginDraggingWidget(WidgetCell v) { diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java index 6a9013d7e..a2584852b 100644 --- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java +++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java @@ -32,7 +32,6 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.anim.Interpolators; -import com.android.launcher3.graphics.GradientView; import com.android.launcher3.model.WidgetItem; import com.android.launcher3.util.PackageUserKey; @@ -55,10 +54,6 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable { super(context, attrs, defStyleAttr); setWillNotDraw(false); mInsets = new Rect(); - - mGradientView = (GradientView) mLauncher.getLayoutInflater().inflate( - R.layout.widgets_bottom_sheet_scrim, mLauncher.getDragLayer(), false); - mGradientView.setProgress(1, false); mContent = this; } @@ -75,7 +70,6 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable { onWidgetsBound(); - mLauncher.getDragLayer().addView(mGradientView); mLauncher.getDragLayer().addView(this); mIsOpen = false; open(true); @@ -157,12 +151,6 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable { } @Override - protected void onCloseComplete() { - super.onCloseComplete(); - mLauncher.getDragLayer().removeView(mGradientView); - } - - @Override protected boolean isOfType(@FloatingViewType int type) { return (type & TYPE_WIDGETS_BOTTOM_SHEET) != 0; } diff --git a/src/com/android/launcher3/widget/WidgetsFullSheet.java b/src/com/android/launcher3/widget/WidgetsFullSheet.java index e461afc20..48f8afecd 100644 --- a/src/com/android/launcher3/widget/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/WidgetsFullSheet.java @@ -71,9 +71,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet mRecyclerView.setAdapter(mAdapter); mAdapter.setApplyBitmapDeferred(true, mRecyclerView); - mGradientView = findViewById(R.id.gradient_bg); - mGradientView.setProgress(1, false); - onWidgetsBound(); } @@ -110,12 +107,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { int widthUsed; if (mInsets.bottom > 0) { - // If we have bottom insets, we do not show the scrim as it would overlap - // with the navbar scrim - mGradientView.setVisibility(View.INVISIBLE); widthUsed = 0; } else { - mGradientView.setVisibility(View.VISIBLE); Rect padding = mLauncher.getDeviceProfile().workspacePadding; widthUsed = Math.max(padding.left + padding.right, 2 * (mInsets.left + mInsets.right)); @@ -124,15 +117,14 @@ public class WidgetsFullSheet extends BaseWidgetSheet int heightUsed = mInsets.top + mLauncher.getDeviceProfile().edgeMarginPx; measureChildWithMargins(mContent, widthMeasureSpec, widthUsed, heightMeasureSpec, heightUsed); - measureChild(mGradientView, widthMeasureSpec, heightMeasureSpec); - setMeasuredDimension(mGradientView.getMeasuredWidth(), mGradientView.getMeasuredHeight()); + setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), + MeasureSpec.getSize(heightMeasureSpec)); } @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { int width = r - l; int height = b - t; - mGradientView.layout(0, 0, width, height); // Content is laid out as center bottom aligned int contentWidth = mContent.getMeasuredWidth(); @@ -177,13 +169,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet mOpenCloseAnimator.removeListener(this); } }); - post(new Runnable() { - @Override - public void run() { - mRecyclerView.setLayoutFrozen(true); - mOpenCloseAnimator.start(); - mContent.animate().alpha(1).setDuration(FADE_IN_DURATION); - } + post(() -> { + mRecyclerView.setLayoutFrozen(true); + mOpenCloseAnimator.start(); + mContent.animate().alpha(1).setDuration(FADE_IN_DURATION); }); } else { setTranslationShift(TRANSLATION_SHIFT_OPENED); |