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

Merge "Merge "Fix layout of DoubleLineTileLayout" into rvc-dev am: 60143d4437 am: bce7811ab4" into rvc-d1-dev-plus-aosp am: cced9c3722

Browse Source 
Change-Id: I843d44fd8dea89db081c9ac4d36992bb1f16ec1c
This commit is contained in:
Automerger Merge Worker
2020-04-03 12:29:01 +00:00
parent 857e2dc22c cced9c3722
commit 42ea74cc4a
2 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -477,6 +477,7 @@
<dimen name="qs_tile_height">106dp</dimen>
<dimen name="qs_tile_layout_margin_side">6dp</dimen>
<dimen name="qs_tile_margin_horizontal">18dp</dimen>
<dimen name="qs_tile_margin_horizontal_two_line">2dp</dimen>
<dimen name="qs_tile_margin_vertical">24dp</dimen>
<dimen name="qs_tile_margin_top_bottom">12dp</dimen>
<dimen name="qs_tile_margin_top_bottom_negative">-12dp</dimen>

77
packages/SystemUI/src/com/android/systemui/qs/DoubleLineTileLayout.kt
View File

@@ -25,13 +25,18 @@ import com.android.systemui.qs.TileLayout.exactly
class DoubleLineTileLayout(context: Context) : ViewGroup(context), QSPanel.QSTileLayout {
companion object {
private const val NUM_LINES = 2
}
protected val mRecords = ArrayList<QSPanel.TileRecord>()
private var _listening = false
private var smallTileSize = 0
private val twoLineHeight
get() = smallTileSize * 2 + cellMarginVertical
get() = smallTileSize * NUM_LINES + cellMarginVertical * (NUM_LINES - 1)
private var cellMarginHorizontal = 0
private var cellMarginVertical = 0
private var tilesToShow = 0
init {
isFocusableInTouchMode = true
@@ -68,7 +73,7 @@ class DoubleLineTileLayout(context: Context) : ViewGroup(context), QSPanel.QSTil
override fun updateResources(): Boolean {
with(mContext.resources) {
smallTileSize = getDimensionPixelSize(R.dimen.qs_quick_tile_size)
cellMarginHorizontal = getDimensionPixelSize(R.dimen.qs_tile_margin_horizontal)
cellMarginHorizontal = getDimensionPixelSize(R.dimen.qs_tile_margin_horizontal_two_line)
cellMarginVertical = getDimensionPixelSize(R.dimen.new_qs_vertical_margin)
}
requestLayout()
@@ -83,11 +88,12 @@ class DoubleLineTileLayout(context: Context) : ViewGroup(context), QSPanel.QSTil
}
}
override fun getNumVisibleTiles() = mRecords.size
override fun getNumVisibleTiles() = tilesToShow
override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
updateResources()
postInvalidate()
}
override fun onFinishInflate() {
@@ -95,39 +101,58 @@ class DoubleLineTileLayout(context: Context) : ViewGroup(context), QSPanel.QSTil
}
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
var previousView: View = this
var tiles = 0
mRecords.forEach {
val tileView = it.tileView
if (tileView.visibility != View.GONE) {
tileView.updateAccessibilityOrder(previousView)
previousView = tileView
tiles++
tileView.measure(exactly(smallTileSize), exactly(smallTileSize))
}
it.tileView.measure(exactly(smallTileSize), exactly(smallTileSize))
}
val height = twoLineHeight
val columns = tiles / 2
val width = paddingStart + paddingEnd +
columns * smallTileSize +
(columns - 1) * cellMarginHorizontal
setMeasuredDimension(width, height)
setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), height)
}
override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
val tiles = mRecords.filter { it.tileView.visibility != View.GONE }
tiles.forEachIndexed {
index, tile ->
val column = index % (tiles.size / 2)
val left = getLeftForColumn(column)
val top = if (index < tiles.size / 2) 0 else getTopBottomRow()
tile.tileView.layout(left, top, left + smallTileSize, top + smallTileSize)
private fun calculateMaxColumns(availableWidth: Int): Int {
if (smallTileSize + cellMarginHorizontal == 0) {
return 0
} else {
return (availableWidth - smallTileSize) / (smallTileSize + cellMarginHorizontal) + 1
}
}
private fun getLeftForColumn(column: Int) = column * (smallTileSize + cellMarginHorizontal)
override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
val availableWidth = r - l - paddingLeft - paddingRight
val maxColumns = calculateMaxColumns(availableWidth)
val actualColumns = Math.min(maxColumns, mRecords.size / NUM_LINES)
if (actualColumns == 0) {
// No tileSize or horizontal margin
return
}
tilesToShow = actualColumns * NUM_LINES
val interTileSpace = if (actualColumns <= 2) {
// Extra "column" of padding to be distributed on each end
(availableWidth - actualColumns * smallTileSize) / actualColumns
} else {
(availableWidth - actualColumns * smallTileSize) / (actualColumns - 1)
}
for (index in 0 until mRecords.size) {
val tileView = mRecords[index].tileView
if (index >= tilesToShow) {
tileView.visibility = View.GONE
} else {
tileView.visibility = View.VISIBLE
if (index > 0) tileView.updateAccessibilityOrder(mRecords[index - 1].tileView)
val column = index % actualColumns
val left = getLeftForColumn(column, interTileSpace, actualColumns <= 2)
val top = if (index < actualColumns) 0 else getTopBottomRow()
tileView.layout(left, top, left + smallTileSize, top + smallTileSize)
}
}
}
private fun getLeftForColumn(column: Int, interSpace: Int, sideMargin: Boolean): Int {
return (if (sideMargin) interSpace / 2 else 0) + column * (smallTileSize + interSpace)
}
private fun getTopBottomRow() = smallTileSize + cellMarginVertical
}