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 am: e87c348fcd am: 96cdae44f6

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

Change-Id: I7c0cd6a785ceaf8368581ab160f54aeb5d6cca04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florence Yang
2022-12-12 15:05:20 +00:00
committed by Automerger Merge Worker
parent b3ac6247e4 96cdae44f6
commit a80b3b3ac1
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
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) {
smallClockIsDark = smallRegionSampler!!.currentRegionDarkness().isDark
largeClockIsDark = largeRegionSampler!!.currentRegionDarkness().isDark
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)

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

@@ -258,7 +258,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

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

@@ -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
@@ -390,7 +391,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) }