Merge "Revert "[flexiglass] Adds WindowSizeClass composition local."" into main (94280d8c) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/core/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -34,9 +34,7 @@ android_library {

	"androidx.compose.runtime_runtime",		"androidx.compose.runtime_runtime",
	"androidx.compose.material3_material3",		"androidx.compose.material3_material3",
	"androidx.compose.material3_material3-window-size-class",
	"androidx.savedstate_savedstate",		"androidx.savedstate_savedstate",
	"androidx.window_window",
	],		],

	kotlincflags: ["-Xjvm-default=all"],		kotlincflags: ["-Xjvm-default=all"],

packages/SystemUI/compose/core/src/com/android/compose/theme/PlatformTheme.kt

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -29,8 +29,6 @@ import com.android.compose.theme.typography.TypefaceNames
	import com.android.compose.theme.typography.TypefaceTokens		import com.android.compose.theme.typography.TypefaceTokens
	import com.android.compose.theme.typography.TypographyTokens		import com.android.compose.theme.typography.TypographyTokens
	import com.android.compose.theme.typography.platformTypography		import com.android.compose.theme.typography.platformTypography
	import com.android.compose.windowsizeclass.LocalWindowSizeClass
	import com.android.compose.windowsizeclass.calculateWindowSizeClass

	/** The Material 3 theme that should wrap all Platform Composables. */		/** The Material 3 theme that should wrap all Platform Composables. */
	@Composable		@Composable
	@@ -53,12 +51,10 @@ fun PlatformTheme(
	remember(typefaceNames) {		remember(typefaceNames) {
	platformTypography(TypographyTokens(TypeScaleTokens(TypefaceTokens(typefaceNames))))		platformTypography(TypographyTokens(TypeScaleTokens(TypefaceTokens(typefaceNames))))
	}		}
	val windowSizeClass = calculateWindowSizeClass()

	MaterialTheme(colorScheme, typography = typography) {		MaterialTheme(colorScheme, typography = typography) {
	CompositionLocalProvider(		CompositionLocalProvider(
	LocalAndroidColorScheme provides androidColorScheme,		LocalAndroidColorScheme provides androidColorScheme,
	LocalWindowSizeClass provides windowSizeClass,
	) {		) {
	content()		content()
	}		}

packages/SystemUI/compose/core/src/com/android/compose/windowsizeclass/WindowSizeClass.kt

deleted100644 → 0

+0 −47

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright 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.compose.windowsizeclass

	import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
	import androidx.compose.material3.windowsizeclass.WindowSizeClass
	import androidx.compose.runtime.Composable
	import androidx.compose.runtime.staticCompositionLocalOf
	import androidx.compose.ui.graphics.toComposeRect
	import androidx.compose.ui.platform.LocalConfiguration
	import androidx.compose.ui.platform.LocalContext
	import androidx.compose.ui.platform.LocalDensity
	import androidx.window.layout.WindowMetricsCalculator

	val LocalWindowSizeClass =
	staticCompositionLocalOf<WindowSizeClass> {
	throw IllegalStateException(
	"No WindowSizeClass configured. Make sure to use LocalWindowSizeClass in a Composable" +
	" surrounded by a PlatformTheme {}."
	)
	}

	@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
	@Composable
	fun calculateWindowSizeClass(): WindowSizeClass {
	// Observe view configuration changes and recalculate the size class on each change.
	LocalConfiguration.current
	val density = LocalDensity.current
	val context = LocalContext.current
	val metrics = WindowMetricsCalculator.getOrCreate().computeCurrentWindowMetrics(context)
	val size = with(density) { metrics.bounds.toComposeRect().size.toDpSize() }
	return WindowSizeClass.calculateFromSize(size)
	}