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

Merge "Use status bar appearance to determine header element brightness." into udc-qpr-dev

Browse Source
This commit is contained in:
Matt Sziklay
2023-06-01 23:46:41 +00:00
committed by Android (Google) Code Review
parent 685876265b 407b180628
commit f502b11399
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/DesktopModeWindowDecorationViewHolder.kt
View File

@@ -4,7 +4,7 @@ import android.app.ActivityManager.RunningTaskInfo
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
import android.view.View import android.view.View
import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
/** /**
* Encapsulates the root [View] of a window decoration and its children to facilitate looking up * Encapsulates the root [View] of a window decoration and its children to facilitate looking up
* children (via findViewById) and updating to the latest data from [RunningTaskInfo]. * children (via findViewById) and updating to the latest data from [RunningTaskInfo].
@@ -23,6 +23,10 @@ internal abstract class DesktopModeWindowDecorationViewHolder(rootView: View) {
* with the caption background color. * with the caption background color.
*/ */
protected fun shouldUseLightCaptionColors(taskInfo: RunningTaskInfo): Boolean { protected fun shouldUseLightCaptionColors(taskInfo: RunningTaskInfo): Boolean {
return Color.valueOf(taskInfo.taskDescription.statusBarColor).luminance() < 0.5 return if (Color.alpha(taskInfo.taskDescription.statusBarColor) != 0) {
Color.valueOf(taskInfo.taskDescription.statusBarColor).luminance() < 0.5
} else {
taskInfo.taskDescription.statusBarAppearance and APPEARANCE_LIGHT_STATUS_BARS == 0
}
} }
} }