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

Commit 96cdae44 authored by Florence Yang's avatar Florence Yang Committed by Automerger Merge Worker
Browse files

Merge "Enable Region Sampling Flag for Teamfood" into tm-qpr-dev am: e87c348f 

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



Change-Id: I84dac26d8ce66695c1bd40d0025aba8fc081c1f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0245411a e87c348f

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+7 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.keyguard



import android.app.WallpaperManager

import android.content.BroadcastReceiver

import android.content.Context

import android.content.Intent
@@ -100,9 +101,13 @@ open class ClockEventController @Inject constructor( 
    private val regionSamplingEnabled = featureFlags.isEnabled(REGION_SAMPLING)



    private fun updateColors() {



        if (regionSamplingEnabled && smallRegionSampler != null && largeRegionSampler != null) {

            val wallpaperManager = WallpaperManager.getInstance(context)

            if (!wallpaperManager.lockScreenWallpaperExists()) {

                smallClockIsDark = smallRegionSampler!!.currentRegionDarkness().isDark

                largeClockIsDark = largeRegionSampler!!.currentRegionDarkness().isDark

            }

        } else {

            val isLightTheme = TypedValue()

            context.theme.resolveAttribute(android.R.attr.isLightTheme, isLightTheme, true)

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ object Flags { 


    // 801 - region sampling

    // TODO(b/254512848): Tracking Bug

    val REGION_SAMPLING = unreleasedFlag(801, "region_sampling")

    val REGION_SAMPLING = unreleasedFlag(801, "region_sampling", teamfood = true)



    // 802 - wallpaper rendering

    // TODO(b/254512923): Tracking Bug

packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.lockscreen



import android.app.PendingIntent

import android.app.WallpaperManager

import android.app.smartspace.SmartspaceConfig

import android.app.smartspace.SmartspaceManager

import android.app.smartspace.SmartspaceSession
@@ -389,7 +390,8 @@ class LockscreenSmartspaceController @Inject constructor( 
    }



    private fun updateTextColorFromWallpaper() {

        if (!regionSamplingEnabled) {

        val wallpaperManager = WallpaperManager.getInstance(context)

        if (!regionSamplingEnabled || wallpaperManager.lockScreenWallpaperExists()) {

            val wallpaperTextColor =

                    Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColor)

            smartspaceViews.forEach { it.setPrimaryTextColor(wallpaperTextColor) }