Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da5f2ff6 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Delete DensityAwareComposeView 

This CL removes the DensityAwareComposeView that was introduced in
ag/25799089 now that b/317317814 was fixed in the Compose libraries in
aosp/2897901.

Bug: 317317814
Test: Manual, verified that b/317317814 does not happen anymore.
Flag: NONE workaround deletion
Change-Id: I003eaedddb0e401a44dcc3080be2f7b555c7e2ef
parent 0d81fcf8

packages/SystemUI/compose/core/src/com/android/compose/ui/platform/DensityAwareComposeView.kt

deleted100644 → 0
+0 −96
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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.ui.platform



import android.content.Context

import android.content.res.Configuration

import android.util.AttributeSet

import androidx.compose.runtime.Composable

import androidx.compose.runtime.mutableStateOf

import androidx.compose.ui.platform.AbstractComposeView



/**

 * A ComposeView that recreates its composition if the display size or font scale was changed.

 *

 * TODO(b/317317814): Remove this workaround.

 */

class DensityAwareComposeView(context: Context) : OpenComposeView(context) {

    private var lastDensityDpi: Int = -1

    private var lastFontScale: Float = -1f



    override fun onAttachedToWindow() {

        super.onAttachedToWindow()



        val configuration = context.resources.configuration

        lastDensityDpi = configuration.densityDpi

        lastFontScale = configuration.fontScale

    }



    override fun dispatchConfigurationChanged(newConfig: Configuration) {

        super.dispatchConfigurationChanged(newConfig)



        // If the density or font scale changed, we dispose then recreate the composition. Note that

        // we do this here after dispatching the new configuration to children (instead of doing

        // this in onConfigurationChanged()) because the new configuration should first be

        // dispatched to the AndroidComposeView that holds the current density before we recreate

        // the composition.

        val densityDpi = newConfig.densityDpi

        val fontScale = newConfig.fontScale

        if (densityDpi != lastDensityDpi || fontScale != lastFontScale) {

            lastDensityDpi = densityDpi

            lastFontScale = fontScale



            disposeComposition()

            if (isAttachedToWindow) {

                createComposition()

            }

        }

    }

}



/** A fork of [androidx.compose.ui.platform.ComposeView] that is open and can be subclassed. */

open class OpenComposeView

internal constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) :

    AbstractComposeView(context, attrs, defStyleAttr) {



    private val content = mutableStateOf<(@Composable () -> Unit)?>(null)



    @Suppress("RedundantVisibilityModifier")

    protected override var shouldCreateCompositionOnAttachedToWindow: Boolean = false



    @Composable

    override fun Content() {

        content.value?.invoke()

    }



    override fun getAccessibilityClassName(): CharSequence {

        return javaClass.name

    }



    /**

     * Set the Jetpack Compose UI content for this view. Initial composition will occur when the

     * view becomes attached to a window or when [createComposition] is called, whichever comes

     * first.

     */

    fun setContent(content: @Composable () -> Unit) {

        shouldCreateCompositionOnAttachedToWindow = true

        this.content.value = content

        if (isAttachedToWindow) {

            createComposition()

        }

    }

}

packages/SystemUI/src/com/android/systemui/qs/QSUtils.kt

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ package com.android.systemui.qs 


import android.content.Context

import android.view.View

import androidx.compose.ui.platform.ComposeView

import androidx.lifecycle.LifecycleOwner

import com.android.compose.theme.PlatformTheme

import com.android.compose.ui.platform.DensityAwareComposeView

import com.android.internal.policy.SystemBarUtils

import com.android.systemui.qs.footer.ui.compose.FooterActions

import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel
@@ -34,7 +34,7 @@ object QSUtils { 
        viewModel: FooterActionsViewModel,

        qsVisibilityLifecycleOwner: LifecycleOwner,

    ): View {

        return DensityAwareComposeView(context).apply {

        return ComposeView(context).apply {

            setContent { PlatformTheme { FooterActions(viewModel, qsVisibilityLifecycleOwner) } }

        }

    }