Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Florence Yang
2022-12-12 02:58:43 +00:00
committed by Android (Google) Code Review
parent 369bce07d6 529fba976e
commit e87c348fcd
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/keyguard/ClockEventController.kt
View File

@@ -15,6 +15,7 @@
*/ */
package com.android.keyguard package com.android.keyguard
import android.app.WallpaperManager
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@@ -100,9 +101,13 @@ open class ClockEventController @Inject constructor(
private val regionSamplingEnabled = featureFlags.isEnabled(REGION_SAMPLING) private val regionSamplingEnabled = featureFlags.isEnabled(REGION_SAMPLING)
private fun updateColors() { private fun updateColors() {
if (regionSamplingEnabled && smallRegionSampler != null && largeRegionSampler != null) { if (regionSamplingEnabled && smallRegionSampler != null && largeRegionSampler != null) {
smallClockIsDark = smallRegionSampler!!.currentRegionDarkness().isDark val wallpaperManager = WallpaperManager.getInstance(context)
largeClockIsDark = largeRegionSampler!!.currentRegionDarkness().isDark if (!wallpaperManager.lockScreenWallpaperExists()) {
smallClockIsDark = smallRegionSampler!!.currentRegionDarkness().isDark
largeClockIsDark = largeRegionSampler!!.currentRegionDarkness().isDark
}
} else { } else {
val isLightTheme = TypedValue() val isLightTheme = TypedValue()
context.theme.resolveAttribute(android.R.attr.isLightTheme, isLightTheme, true) context.theme.resolveAttribute(android.R.attr.isLightTheme, isLightTheme, true)

2
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -253,7 +253,7 @@ object Flags {
// 801 - region sampling // 801 - region sampling
// TODO(b/254512848): Tracking Bug // TODO(b/254512848): Tracking Bug
val REGION_SAMPLING = unreleasedFlag(801, "region_sampling") val REGION_SAMPLING = unreleasedFlag(801, "region_sampling", teamfood = true)
// 802 - wallpaper rendering // 802 - wallpaper rendering
// TODO(b/254512923): Tracking Bug // TODO(b/254512923): Tracking Bug

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

@@ -17,6 +17,7 @@
package com.android.systemui.statusbar.lockscreen package com.android.systemui.statusbar.lockscreen
import android.app.PendingIntent import android.app.PendingIntent
import android.app.WallpaperManager
import android.app.smartspace.SmartspaceConfig import android.app.smartspace.SmartspaceConfig
import android.app.smartspace.SmartspaceManager import android.app.smartspace.SmartspaceManager
import android.app.smartspace.SmartspaceSession import android.app.smartspace.SmartspaceSession
@@ -389,7 +390,8 @@ class LockscreenSmartspaceController @Inject constructor(
} }
private fun updateTextColorFromWallpaper() { private fun updateTextColorFromWallpaper() {
if (!regionSamplingEnabled) { val wallpaperManager = WallpaperManager.getInstance(context)
if (!regionSamplingEnabled || wallpaperManager.lockScreenWallpaperExists()) {
val wallpaperTextColor = val wallpaperTextColor =
Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColor) Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColor)
smartspaceViews.forEach { it.setPrimaryTextColor(wallpaperTextColor) } smartspaceViews.forEach { it.setPrimaryTextColor(wallpaperTextColor) }