Jordan Silva
ce396d8abf
This issue happens when restoring the data from a phone to a tablet or vice-versa. When Launcher is restoring the data, it allows the device to load a disabled or invalid grid temporarly for the migration. This leads to a crash when the responsive grid is enabled. The hotseat spec has only WIDTH or HEIGHT specs in a certain posture. When the user restores the data from a phone to a tablet, the Launcher loads a handheld spec that doesn't have HEIGHT specs for the hotseat in landscape (spec_handheld_hotseat_[grid].xml). However, the tablet, in landscape, tries to retrieve the hotseat HEIGHT spec. It also prevent crash when responsive grid is used with multi window mode. isVerticalBarLayout becomes false. Then, the responsive grid tries to load a hotseat spec that doesn't exist (using DimensionType.HEIGHT). Phones have hotseat specs only for DimensionType.WIDTH. Bug: 315548992 Fix: 315069300 Fix: 315377544 Flag: ACONFIG com.android.launcher3.enable_responsive_workspace TEAMFOOD Test: v2/android-crystalball-eng/health/microbench/systemui/main/systemui-notification-3-jank-suite Test: atest CtsWindowManagerDeviceDisplay:android.server.wm.display.MultiDisplaySystemDecorationTests#testSendPrimaryHomeIntentActivityOnDisplayWithDecorations -- --abi x86_64 Change-Id: Ibd6537e0528868da9a1b7672c43b5455fa6a8184
95 lines
3.5 KiB
Kotlin
95 lines
3.5 KiB
Kotlin
/*
|
|
* Copyright (C) 2023 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.launcher3.responsive
|
|
|
|
import android.content.res.TypedArray
|
|
import com.android.launcher3.R
|
|
import com.android.launcher3.responsive.ResponsiveSpec.Companion.ResponsiveSpecType
|
|
import com.android.launcher3.responsive.ResponsiveSpec.DimensionType
|
|
|
|
/**
|
|
* Base class for responsive specs that holds a list of width and height specs.
|
|
*
|
|
* @param widthSpecs List of width responsive specifications
|
|
* @param heightSpecs List of height responsive specifications
|
|
*/
|
|
class ResponsiveSpecGroup<T : IResponsiveSpec>(
|
|
val aspectRatio: Float,
|
|
widthSpecs: List<T>,
|
|
heightSpecs: List<T>
|
|
) {
|
|
val widthSpecs: List<T>
|
|
val heightSpecs: List<T>
|
|
|
|
init {
|
|
check(aspectRatio > 0f) { "Invalid aspect ratio! Aspect ratio should be bigger than zero." }
|
|
this.widthSpecs = widthSpecs.sortedBy { it.maxAvailableSize }
|
|
this.heightSpecs = heightSpecs.sortedBy { it.maxAvailableSize }
|
|
}
|
|
|
|
/**
|
|
* Get a [ResponsiveSpec] within the breakpoint.
|
|
*
|
|
* @param type Type of the spec to be retrieved (width or height)
|
|
* @param availableSize The breakpoint for the spec
|
|
* @return A [ResponsiveSpec].
|
|
*/
|
|
fun getSpec(type: DimensionType, availableSize: Int): T {
|
|
val spec =
|
|
if (type == DimensionType.WIDTH) {
|
|
widthSpecs.firstOrNull { availableSize <= it.maxAvailableSize }
|
|
} else {
|
|
heightSpecs.firstOrNull { availableSize <= it.maxAvailableSize }
|
|
}
|
|
check(spec != null) { "No available $type spec found within $availableSize. $this" }
|
|
return spec
|
|
}
|
|
|
|
override fun toString(): String {
|
|
fun printSpec(spec: IResponsiveSpec) =
|
|
when (spec.specType) {
|
|
ResponsiveSpecType.AllApps,
|
|
ResponsiveSpecType.Folder,
|
|
ResponsiveSpecType.Workspace -> (spec as ResponsiveSpec).toString()
|
|
ResponsiveSpecType.Hotseat -> (spec as HotseatSpec).toString()
|
|
ResponsiveSpecType.Cell -> (spec as CellSpec).toString()
|
|
}
|
|
|
|
val widthSpecsString = widthSpecs.joinToString(", ") { printSpec(it) }
|
|
val heightSpecsString = heightSpecs.joinToString(", ") { printSpec(it) }
|
|
return "ResponsiveSpecGroup(" +
|
|
"aspectRatio=${aspectRatio}, " +
|
|
"widthSpecs=[${widthSpecsString}], " +
|
|
"heightSpecs=[${heightSpecsString}]" +
|
|
")"
|
|
}
|
|
|
|
companion object {
|
|
const val XML_GROUP_NAME = "specs"
|
|
|
|
fun <T : IResponsiveSpec> create(
|
|
attrs: TypedArray,
|
|
specs: List<T>
|
|
): ResponsiveSpecGroup<T> {
|
|
val (widthSpecs, heightSpecs) =
|
|
specs.partition { it.dimensionType == DimensionType.WIDTH }
|
|
val aspectRatio = attrs.getFloat(R.styleable.ResponsiveSpecGroup_maxAspectRatio, 0f)
|
|
return ResponsiveSpecGroup(aspectRatio, widthSpecs, heightSpecs)
|
|
}
|
|
}
|
|
}
|