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

Commit 2d8698f0 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge changes I3713c8ed,Id589c335 into udc-dev am: 2943b0e5 am: b79733c8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22572283



Change-Id: I76368c117ed09267dd1c21279c3344559ca25855
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd50603c b79733c8

packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt

+3 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import com.android.systemui.settings.dagger.MultiUserUtilsModule 
import com.android.systemui.shortcut.ShortcutKeyDispatcher

import com.android.systemui.statusbar.notification.InstantAppNotifier

import com.android.systemui.statusbar.phone.KeyguardLiftController

import com.android.systemui.statusbar.phone.LetterboxModule

import com.android.systemui.stylus.StylusUsiPowerStartable

import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator

import com.android.systemui.theme.ThemeOverlayController
@@ -66,7 +67,8 @@ import dagger.multibindings.IntoMap 
 */

@Module(includes = [

    MultiUserUtilsModule::class,

    StartControlsStartableModule::class

    StartControlsStartableModule::class,

    LetterboxModule::class,

])

abstract class SystemUICoreStartableModule {

    /** Inject into AuthController.  */

packages/SystemUI/src/com/android/systemui/dump/DumpManager.kt

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ open class DumpManager @Inject constructor() { 
    private val dumpables: MutableMap<String, RegisteredDumpable<Dumpable>> = ArrayMap()

    private val buffers: MutableMap<String, RegisteredDumpable<LogBuffer>> = ArrayMap()



    /** See [registerCriticalDumpable]. */

    fun registerCriticalDumpable(module: Dumpable) {

        registerCriticalDumpable(module::class.java.simpleName, module)

    }



    /**

     * Registers a dumpable to be called during the CRITICAL section of the bug report.

     *

packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxAppearanceCalculator.kt

+10 −14
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ import android.view.WindowInsetsController.Appearance 
import com.android.internal.statusbar.LetterboxDetails

import com.android.internal.util.ContrastColorUtil

import com.android.internal.view.AppearanceRegion

import com.android.systemui.Dumpable

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dump.DumpManager

import com.android.systemui.statusbar.core.StatusBarInitializer.OnStatusBarViewInitializedListener

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent.CentralSurfacesScope

import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent

import java.io.PrintWriter

import java.util.Arrays
@@ -50,24 +50,20 @@ class LetterboxAppearance( 
 * Responsible for calculating the [Appearance] and [AppearanceRegion] for the status bar when apps

 * are letterboxed.

 */

@CentralSurfacesScope

@SysUISingleton

class LetterboxAppearanceCalculator

@Inject

constructor(

    private val lightBarController: LightBarController,

    private val dumpManager: DumpManager,

    dumpManager: DumpManager,

    private val letterboxBackgroundProvider: LetterboxBackgroundProvider,

) : OnStatusBarViewInitializedListener, CentralSurfacesComponent.Startable {

) : OnStatusBarViewInitializedListener, Dumpable {



    private var statusBarBoundsProvider: StatusBarBoundsProvider? = null



    override fun start() {

        dumpManager.registerCriticalDumpable(javaClass.simpleName) { pw, _ -> dump(pw) }

    init {

        dumpManager.registerCriticalDumpable(this)

    }



    override fun stop() {

        dumpManager.unregisterDumpable(javaClass.simpleName)

    }

    private var statusBarBoundsProvider: StatusBarBoundsProvider? = null



    private var lastAppearance: Int? = null

    private var lastAppearanceRegions: Array<AppearanceRegion>? = null
@@ -216,8 +212,8 @@ constructor( 
        return this.intersect(other)

    }



    private fun dump(printWriter: PrintWriter) {

        printWriter.println(

    override fun dump(pw: PrintWriter, args: Array<out String>) {

        pw.println(

            """

           lastAppearance: ${lastAppearance?.toAppearanceString()}

           lastAppearanceRegion: ${Arrays.toString(lastAppearanceRegions)},

packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxBackgroundProvider.kt

+4 −13
Original line number Diff line number Diff line
@@ -22,28 +22,25 @@ import android.graphics.Color 
import android.os.Handler

import android.os.RemoteException

import android.view.IWindowManager

import com.android.systemui.CoreStartable

import com.android.systemui.Dumpable

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.dump.DumpManager

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent.CentralSurfacesScope

import java.io.PrintWriter

import java.util.concurrent.Executor

import javax.inject.Inject



/** Responsible for providing information about the background of letterboxed apps. */

@CentralSurfacesScope

@SysUISingleton

class LetterboxBackgroundProvider

@Inject

constructor(

    private val windowManager: IWindowManager,

    @Background private val backgroundExecutor: Executor,

    private val dumpManager: DumpManager,

    private val wallpaperManager: WallpaperManager,

    @Main private val mainHandler: Handler,

) : CentralSurfacesComponent.Startable, Dumpable {



) : CoreStartable, Dumpable {

    @ColorInt

    var letterboxBackgroundColor: Int = Color.BLACK

        private set
@@ -57,7 +54,6 @@ constructor( 
        }



    override fun start() {

        dumpManager.registerDumpable(javaClass.simpleName, this)

        fetchBackgroundColorInfo()

        wallpaperManager.addOnColorsChangedListener(wallpaperColorsListener, mainHandler)

    }
@@ -74,11 +70,6 @@ constructor( 
        }

    }



    override fun stop() {

        dumpManager.unregisterDumpable(javaClass.simpleName)

        wallpaperManager.removeOnColorsChangedListener(wallpaperColorsListener)

    }



    override fun dump(pw: PrintWriter, args: Array<out String>) {

        pw.println(

            """

packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxModule.kt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * 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.systemui.statusbar.phone



import com.android.systemui.CoreStartable

import dagger.Binds

import dagger.Module

import dagger.multibindings.ClassKey

import dagger.multibindings.IntoMap



@Module

abstract class LetterboxModule {

    @Binds

    @IntoMap

    @ClassKey(LetterboxBackgroundProvider::class)

    abstract fun bindFeature(impl: LetterboxBackgroundProvider): CoreStartable

}