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

Commit d7abdd72 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] Define DisplayMetricsRepo and use it for QsFrameTranslateImpl. 

CentralSurfacesImpl updated the display metrics on configuration change
(see #updateDisplaySize), so the new repo does the same.

Removing QsFrameTranslateImpl's usage of CentralSurfaces is necessary to
make NotificationPanelViewController a singleton.

Bug: 277762009
Bug: 277764509
Test: atest DisplayMetricsRepositoryTest
Test: `adb shell dumpsys activity service
com.android.systemui/.SystemUIService DisplayMetricsRepo` -> dumps the
display metric changes. Notably, the widthPixels and heightPixels change
when the device is rotated.

Change-Id: Ibef256bab38db5a7226d29a8b68546f093b78dd8
parent 59d74fa2

packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayMetricsRepository.kt

0 → 100644
+74 −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.display.data.repository



import android.content.Context

import android.content.res.Configuration

import android.util.DisplayMetrics

import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.log.LogBuffer

import com.android.systemui.log.LogLevel

import com.android.systemui.log.dagger.DisplayMetricsRepoLog

import com.android.systemui.statusbar.policy.ConfigurationController

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.channels.awaitClose

import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.flow.stateIn



/** Repository tracking display-related metrics like display height and width. */

@SysUISingleton

class DisplayMetricsRepository

@Inject

constructor(

    @Application scope: CoroutineScope,

    configurationController: ConfigurationController,

    displayMetricsHolder: DisplayMetrics,

    context: Context,

    @DisplayMetricsRepoLog logBuffer: LogBuffer,

) {



    private val displayMetrics: StateFlow<DisplayMetrics> =

        conflatedCallbackFlow {

                val callback =

                    object : ConfigurationController.ConfigurationListener {

                        override fun onConfigChanged(newConfig: Configuration?) {

                            context.display.getMetrics(displayMetricsHolder)

                            trySend(displayMetricsHolder)

                        }

                    }

                configurationController.addCallback(callback)

                awaitClose { configurationController.removeCallback(callback) }

            }

            .onEach {

                logBuffer.log(

                    "DisplayMetrics",

                    LogLevel.INFO,

                    { str1 = it.toString() },

                    { "New metrics: $str1" },

                )

            }

            .stateIn(scope, SharingStarted.Eagerly, displayMetricsHolder)



    /** Returns the current display height in pixels. */

    val heightPixels: Int

        get() = displayMetrics.value.heightPixels

}

packages/SystemUI/src/com/android/systemui/log/dagger/DisplayMetricsRepoLog.kt

0 → 100644
+25 −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.log.dagger



import javax.inject.Qualifier



/** A [com.android.systemui.log.LogBuffer] for display metrics related logging. */

@Qualifier

@MustBeDocumented

@Retention(AnnotationRetention.RUNTIME)

annotation class DisplayMetricsRepoLog

packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java

+8 −0
Original line number Diff line number Diff line
@@ -488,4 +488,12 @@ public class LogModule { 
    public static LogBuffer provideDreamLogBuffer(LogBufferFactory factory) {

        return factory.create("DreamLog", 250);

    }



    /** Provides a {@link LogBuffer} for display metrics related logs. */

    @Provides

    @SysUISingleton

    @DisplayMetricsRepoLog

    public static LogBuffer provideDisplayMetricsRepoLogBuffer(LogBufferFactory factory) {

        return factory.create("DisplayMetricsRepo", 50);

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/QsFrameTranslateController.java

+4 −4
Original line number Diff line number Diff line
@@ -18,19 +18,19 @@ package com.android.systemui.statusbar; 


import android.view.View;



import com.android.systemui.display.data.repository.DisplayMetricsRepository;

import com.android.systemui.plugins.qs.QS;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.phone.CentralSurfaces;



/**

 * Calculates and moves the QS frame vertically.

 */

public abstract class QsFrameTranslateController {



    protected CentralSurfaces mCentralSurfaces;

    protected DisplayMetricsRepository mDisplayMetricsRepository;



    public QsFrameTranslateController(CentralSurfaces centralSurfaces) {

        mCentralSurfaces = centralSurfaces;

    public QsFrameTranslateController(DisplayMetricsRepository displayMetricsRepository) {

        mDisplayMetricsRepository = displayMetricsRepository;

    }



    /**

packages/SystemUI/src/com/android/systemui/statusbar/QsFrameTranslateImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ package com.android.systemui.statusbar; 
import android.view.View;



import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.display.data.repository.DisplayMetricsRepository;

import com.android.systemui.plugins.qs.QS;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.phone.CentralSurfaces;



import javax.inject.Inject;
@@ -34,8 +34,8 @@ import javax.inject.Inject; 
public class QsFrameTranslateImpl extends QsFrameTranslateController {



    @Inject

    public QsFrameTranslateImpl(CentralSurfaces centralSurfaces) {

        super(centralSurfaces);

    public QsFrameTranslateImpl(DisplayMetricsRepository displayMetricsRepository) {

        super(displayMetricsRepository);

    }



    @Override