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

Commit 970564e2 authored Jul 26, 2023 by Matthew Duggan Committed by Automerger Merge Worker Jul 26, 2023

Merge "Allow separate configuration of display color fade" into udc-qpr-dev am: 7d9ba800

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

Change-Id: I02c3a1cd5e949329f80a309fcf0ebe816ed2956a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 4eeb0fde 7d9ba800

core/res/res/values/config.xml

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2694,6 +2694,9 @@
	backlight values -->		backlight values -->
	<bool name="config_displayBrightnessBucketsInDoze">false</bool>		<bool name="config_displayBrightnessBucketsInDoze">false</bool>

			<!-- True to skip the fade animation on display off event -->
			<bool name="config_displayColorFadeDisabled">false</bool>

	<!-- Power Management: Specifies whether to decouple the auto-suspend state of the		<!-- Power Management: Specifies whether to decouple the auto-suspend state of the
	device from the display on/off state.		device from the display on/off state.

core/res/res/values/symbols.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3856,6 +3856,7 @@
	<java-symbol type="bool" name="config_dozeSupportsAodWallpaper" />		<java-symbol type="bool" name="config_dozeSupportsAodWallpaper" />
	<java-symbol type="bool" name="config_displayBlanksAfterDoze" />		<java-symbol type="bool" name="config_displayBlanksAfterDoze" />
	<java-symbol type="bool" name="config_displayBrightnessBucketsInDoze" />		<java-symbol type="bool" name="config_displayBrightnessBucketsInDoze" />
			<java-symbol type="bool" name="config_displayColorFadeDisabled" />
	<java-symbol type="integer" name="config_storageManagerDaystoRetainDefault" />		<java-symbol type="integer" name="config_storageManagerDaystoRetainDefault" />
	<java-symbol type="string" name="config_headlineFontFamily" />		<java-symbol type="string" name="config_headlineFontFamily" />
	<java-symbol type="string" name="config_headlineFontFamilyMedium" />		<java-symbol type="string" name="config_headlineFontFamilyMedium" />

services/core/java/com/android/server/display/DisplayPowerController.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -724,7 +724,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call

	setUpAutoBrightness(resources, handler);		setUpAutoBrightness(resources, handler);

	mColorFadeEnabled = !ActivityManager.isLowRamDeviceStatic();		mColorFadeEnabled = !ActivityManager.isLowRamDeviceStatic()
			&& !resources.getBoolean(
			com.android.internal.R.bool.config_displayColorFadeDisabled);
	mColorFadeFadesConfig = resources.getBoolean(		mColorFadeFadesConfig = resources.getBoolean(
	com.android.internal.R.bool.config_animateScreenLights);		com.android.internal.R.bool.config_animateScreenLights);

services/core/java/com/android/server/display/DisplayPowerController2.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -611,7 +611,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal

	setUpAutoBrightness(resources, handler);		setUpAutoBrightness(resources, handler);

	mColorFadeEnabled = mInjector.isColorFadeEnabled();		mColorFadeEnabled = mInjector.isColorFadeEnabled()
			&& !resources.getBoolean(
			com.android.internal.R.bool.config_displayColorFadeDisabled);
	mColorFadeFadesConfig = resources.getBoolean(		mColorFadeFadesConfig = resources.getBoolean(
	R.bool.config_animateScreenLights);		R.bool.config_animateScreenLights);