Merge "Allow the Material 3 override to bypass an already set value" into main (3e26ed85) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/util/ThemeUtils.kt

+6 −3

Original line number	Diff line number	Diff line
		@@ -342,9 +342,12 @@ interface Config {
		class Material3ConfigImpl() : Config {
		override var forceMaterial3: Boolean? = null
		set(value) {
		if (field != null) {
		Log.e(TAG, "forceMaterial3 is already set to $forceMaterial3")
		return
		if (field != null && field != value) {
		Log.w(
		TAG,
		"forceMaterial3 already set ($field) but overriding to $value. " +
		"This could result in unstable behaviour."
		)
		}

		field = value