Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix padding in management activities" into rvc-qpr-dev am: 6bc0931e86

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12393705

Change-Id: I98cb84b9a414e6f4b54b646908a2238f39077a7d
This commit is contained in:
Fabian Kozynski
2020-08-18 13:40:17 +00:00
committed by Automerger Merge Worker
parent abdb4390c7 6bc0931e86
commit f1d48ccdeb
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -1371,7 +1371,7 @@
<dimen name="controls_app_divider_height">2dp</dimen> <dimen name="controls_app_divider_height">2dp</dimen>
<dimen name="controls_app_divider_side_margin">32dp</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> <item name="control_card_elevation" type="dimen" format="float">15</item>
<dimen name="controls_dialog_padding">32dp</dimen> <dimen name="controls_dialog_padding">32dp</dimen>

9
packages/SystemUI/src/com/android/systemui/controls/management/ControlAdapter.kt
View File

@@ -72,8 +72,13 @@ class ControlAdapter(
TYPE_CONTROL -> { TYPE_CONTROL -> {
ControlHolder( ControlHolder(
layoutInflater.inflate(R.layout.controls_base_item, parent, false).apply { layoutInflater.inflate(R.layout.controls_base_item, parent, false).apply {
layoutParams.apply { (layoutParams as ViewGroup.MarginLayoutParams).apply {
width = ViewGroup.LayoutParams.MATCH_PARENT 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 elevation = this@ControlAdapter.elevation
background = parent.context.getDrawable( background = parent.context.getDrawable(
@@ -386,7 +391,7 @@ class MarginItemDecorator(
val type = parent.adapter?.getItemViewType(position) val type = parent.adapter?.getItemViewType(position)
if (type == ControlAdapter.TYPE_CONTROL) { if (type == ControlAdapter.TYPE_CONTROL) {
outRect.apply { outRect.apply {
top = topMargin top = topMargin * 2 // Use double margin, as we are not setting bottom
left = sideMargins left = sideMargins
right = sideMargins right = sideMargins
bottom = 0 bottom = 0