Merge "Fix padding in management activities" into rvc-qpr-dev am: 6bc0931e86 am: f1d48ccdeb (e0443b41) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/dimens.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1342,7 +1342,7 @@
		<dimen name="controls_app_divider_height">2dp</dimen>
		<dimen name="controls_app_divider_side_margin">32dp</dimen>

		<dimen name="controls_card_margin">2dp</dimen>
		<dimen name="controls_card_margin">@dimen/control_base_item_margin</dimen>
		<item name="control_card_elevation" type="dimen" format="float">15</item>

		<dimen name="controls_dialog_padding">32dp</dimen>

+7 −2

Original line number	Diff line number	Diff line
		@@ -72,8 +72,13 @@ class ControlAdapter(
		TYPE_CONTROL -> {
		ControlHolder(
		layoutInflater.inflate(R.layout.controls_base_item, parent, false).apply {
		layoutParams.apply {
		(layoutParams as ViewGroup.MarginLayoutParams).apply {
		width = ViewGroup.LayoutParams.MATCH_PARENT
		// Reset margins as they will be set through the decoration
		topMargin = 0
		bottomMargin = 0
		leftMargin = 0
		rightMargin = 0
		}
		elevation = this@ControlAdapter.elevation
		background = parent.context.getDrawable(
		@@ -386,7 +391,7 @@ class MarginItemDecorator(
		val type = parent.adapter?.getItemViewType(position)
		if (type == ControlAdapter.TYPE_CONTROL) {
		outRect.apply {
		top = topMargin
		top = topMargin * 2 // Use double margin, as we are not setting bottom
		left = sideMargins
		right = sideMargins
		bottom = 0