Merge "Clone mInsets when copying DeviceProfile to taskbar" into tm-dev (833c2105) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -785,5 +785,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
		pw.println(String.format(
		"%s\tmBindInProgress=%b", prefix, mBindingItems));
		mControllers.dumpLogs(prefix + "\t", pw);
		mDeviceProfile.dump(prefix, pw);
		}
		}

quickstep/src/com/android/quickstep/TouchInteractionService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -962,10 +962,10 @@ public class TouchInteractionService extends Service
		RecentsModel.INSTANCE.get(this).dump("", pw);
		pw.println("ProtoTrace:");
		pw.println(" file=" + ProtoTracer.INSTANCE.get(this).getTraceFile());
		mTaskbarManager.dumpLogs("", pw);
		if (createdOverviewActivity != null) {
		createdOverviewActivity.getDeviceProfile().dump("", pw);
		}
		mTaskbarManager.dumpLogs("", pw);
		}
		}

src/com/android/launcher3/DeviceProfile.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -250,6 +250,7 @@ public class DeviceProfile {
		windowX = windowBounds.bounds.left;
		windowY = windowBounds.bounds.top;
		this.rotationHint = windowBounds.rotationHint;
		mInsets.set(windowBounds.insets);

		isScalableGrid = inv.isScalable && !isVerticalBarLayout() && !isMultiWindowMode;

		@@ -302,7 +303,7 @@ public class DeviceProfile {
		desiredWorkspaceHorizontalMarginPx = getHorizontalMarginPx(inv, res);
		desiredWorkspaceHorizontalMarginOriginalPx = desiredWorkspaceHorizontalMarginPx;

		bottomSheetTopPadding = windowBounds.insets.top // statusbar height
		bottomSheetTopPadding = mInsets.top // statusbar height
		+ res.getDimensionPixelSize(R.dimen.bottom_sheet_extra_top_padding)
		+ (isTablet ? 0 : edgeMarginPx); // phones need edgeMarginPx additional padding

		@@ -569,6 +570,7 @@ public class DeviceProfile {
		WindowBounds bounds = new WindowBounds(
		widthPx, heightPx, availableWidthPx, availableHeightPx, rotationHint);
		bounds.bounds.offsetTo(windowX, windowY);
		bounds.insets.set(mInsets);
		return new Builder(context, inv, mInfo)
		.setWindowBounds(bounds)
		.setUseTwoPanels(isTwoPanels)
		@@ -1192,9 +1194,12 @@ public class DeviceProfile {
		writer.println(prefix + pxToDpStr("windowY", windowY));
		writer.println(prefix + pxToDpStr("widthPx", widthPx));
		writer.println(prefix + pxToDpStr("heightPx", heightPx));

		writer.println(prefix + pxToDpStr("availableWidthPx", availableWidthPx));
		writer.println(prefix + pxToDpStr("availableHeightPx", availableHeightPx));
		writer.println(prefix + pxToDpStr("mInsets.left", mInsets.left));
		writer.println(prefix + pxToDpStr("mInsets.top", mInsets.top));
		writer.println(prefix + pxToDpStr("mInsets.right", mInsets.right));
		writer.println(prefix + pxToDpStr("mInsets.bottom", mInsets.bottom));

		writer.println(prefix + "\taspectRatio:" + aspectRatio);

		@@ -1240,6 +1245,10 @@ public class DeviceProfile {
		writer.println(prefix + pxToDpStr("folderCellLayoutBorderSpacePx Vertical",
		folderCellLayoutBorderSpacePx.y));

		writer.println(prefix + pxToDpStr("bottomSheetTopPadding", bottomSheetTopPadding));

		writer.println(prefix + pxToDpStr("allAppsShiftRange", allAppsShiftRange));
		writer.println(prefix + pxToDpStr("allAppsTopPadding", allAppsTopPadding));
		writer.println(prefix + pxToDpStr("allAppsIconSizePx", allAppsIconSizePx));
		writer.println(prefix + pxToDpStr("allAppsIconTextSizePx", allAppsIconTextSizePx));
		writer.println(prefix + pxToDpStr("allAppsIconDrawablePaddingPx",