diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-10-04 23:36:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-10-04 23:36:22 +0000 |
| commit | e5865a03bb661887910f0c1809bc3eda56092996 (patch) | |
| tree | 2dc001439e759b6eb6c2ac438e57619f92a81f66 | |
| parent | af754b9a9af47448916a4382aeaedd2e93c3b599 (diff) | |
| parent | f1424a3b38bdbd7fde540a1b54b54f279c24a4b7 (diff) | |
| download | packages_apps_Trebuchet-e5865a03bb661887910f0c1809bc3eda56092996.tar.gz packages_apps_Trebuchet-e5865a03bb661887910f0c1809bc3eda56092996.tar.bz2 packages_apps_Trebuchet-e5865a03bb661887910f0c1809bc3eda56092996.zip | |
Merge "Decouple grid size and widget preview size in WidgetsRecyclerView" into ub-launcher3-qt-future-dev
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/WidgetPreviewLoader.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetCell.java | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index c034d2de2..736142f19 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -111,6 +111,7 @@ public class DeviceProfile { // All apps public int allAppsCellHeightPx; + public int allAppsCellWidthPx; public int allAppsIconSizePx; public int allAppsIconDrawablePaddingPx; public float allAppsIconTextSizePx; @@ -349,6 +350,7 @@ public class DeviceProfile { allAppsIconDrawablePaddingPx = iconDrawablePaddingPx; allAppsCellHeightPx = getCellSize().y; } + allAppsCellWidthPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx; if (isVerticalBarLayout()) { // Always hide the Workspace text with vertical bar layout. diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index 003bcc1ce..c6381b058 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -450,7 +450,7 @@ public class WidgetPreviewLoader { private Bitmap generateShortcutPreview(BaseActivity launcher, ShortcutConfigActivityInfo info, int maxWidth, int maxHeight, Bitmap preview) { - int iconSize = launcher.getDeviceProfile().iconSizePx; + int iconSize = launcher.getDeviceProfile().allAppsIconSizePx; int padding = launcher.getResources() .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding); diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java index dc4af8caf..412fb7ba6 100644 --- a/src/com/android/launcher3/widget/WidgetCell.java +++ b/src/com/android/launcher3/widget/WidgetCell.java @@ -103,7 +103,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { private void setContainerWidth() { DeviceProfile profile = mActivity.getDeviceProfile(); - mCellSize = (int) (profile.cellWidthPx * WIDTH_SCALE); + mCellSize = (int) (profile.allAppsCellWidthPx * WIDTH_SCALE); mPresetPreviewSize = (int) (mCellSize * PREVIEW_SCALE); } |