Snap for 7562406 from 0841e93a342fefe6afe9fba4bd77933fb438d976 to sc-v2-release
Change-Id: I3c11fa0ba9fb2085d12ddba8ba15c9c0787e9fbd
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
index 6e20398..4ebdbd8 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
@@ -114,7 +114,13 @@
* Returns whether the user can manually stash the taskbar based on the current device state.
*/
private boolean supportsStashing() {
- return !mActivity.isThreeButtonNav();
+ return !mActivity.isThreeButtonNav()
+ && (!Utilities.IS_RUNNING_IN_TEST_HARNESS || supportsStashingForTests());
+ }
+
+ private boolean supportsStashingForTests() {
+ // TODO: enable this for tests that specifically check stash/unstash behavior.
+ return false;
}
/**
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 0c9a15a..d3f4528 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -332,8 +332,8 @@
scale = Math.min(maxWidth / previewWidth, 1);
}
setContainerSize(
- Math.round(drawable.getIntrinsicWidth() * scale),
- Math.round(drawable.getIntrinsicHeight() * scale));
+ Math.round(drawable.getIntrinsicWidth() * scale * mPreviewContainerScale),
+ Math.round(drawable.getIntrinsicHeight() * scale * mPreviewContainerScale));
mWidgetImage.setDrawable(drawable);
mWidgetImage.setVisibility(View.VISIBLE);
if (mAppWidgetHostViewPreview != null) {