Merge "New screen shut down animation." into lmp-dev (b46dea56) · Commits · e / os / android_frameworks_base

core/res/res/raw/color_fade_frag.frag

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		#extension GL_OES_EGL_image_external : require

		precision mediump float;
		uniform samplerExternalOES texUnit;
		uniform float opacity;
		uniform float saturation;
		uniform float gamma;
		varying vec2 UV;

		vec3 rgb2hsl(vec3 rgb)
		{
		float e = 1.0e-7;

		vec4 p = rgb.g < rgb.b ? vec4(rgb.bg, -1.0, 2.0 / 3.0) : vec4(rgb.gb, 0.0, -1.0 / 3.0);
		vec4 q = rgb.r < p.x ? vec4(p.xyw, rgb.r) : vec4(rgb.r, p.yzx);

		float v = q.x;
		float c = v - min(q.w, q.y);
		float h = abs((q.w - q.y) / (6.0 * c + e) + q.z);
		float l = v - c * 0.5;
		float s = c / (1.0 - abs(2.0 * l - 1.0) + e);
		return clamp(vec3(h, s, l), 0.0, 1.0);
		}

		vec3 hsl2rgb(vec3 hsl)
		{
		vec3 h = vec3(hsl.x * 6.0);
		vec3 p = abs(h - vec3(3.0, 2.0, 4.0));
		vec3 q = 2.0 - p;

		vec3 rgb = clamp(vec3(p.x - 1.0, q.yz), 0.0, 1.0);
		float c = (1.0 - abs(2.0 * hsl.z - 1.0)) * hsl.y;
		return (rgb - vec3(0.5)) * c + hsl.z;
		}

		void main()
		{
		vec4 color = texture2D(texUnit, UV);
		vec3 hsl = rgb2hsl(color.xyz);
		vec3 rgb = pow(hsl2rgb(vec3(hsl.x, hsl.y * saturation, hsl.z * opacity)), vec3(gamma));
		gl_FragColor = vec4(rgb, 1.0);
		}

core/res/res/raw/color_fade_vert.vert

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		uniform mat4 proj_matrix;
		uniform mat4 tex_matrix;
		uniform float scale;
		attribute vec2 position;
		attribute vec2 uv;
		varying vec2 UV;

		void main()
		{
		vec4 transformed_uv = tex_matrix * vec4(uv.x, uv.y, 1.0, 1.0);
		UV = transformed_uv.st / transformed_uv.q;
		gl_Position = vec4(scale, scale, 1.0, 1.0) * (proj_matrix * vec4(position.x, position.y, 0.0, 1.0));
		}

core/res/res/values/symbols.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -1266,6 +1266,8 @@
		<java-symbol type="xml" name="default_zen_mode_config" />
		<java-symbol type="xml" name="tv_content_rating_systems" />

		<java-symbol type="raw" name="color_fade_vert" />
		<java-symbol type="raw" name="color_fade_frag" />
		<java-symbol type="raw" name="accessibility_gestures" />
		<java-symbol type="raw" name="incognito_mode_start_page" />
		<java-symbol type="raw" name="loaderror" />

services/core/java/com/android/server/display/ElectronBeam.java→services/core/java/com/android/server/display/ColorFade.java

+223 −220

File changed and moved.

Preview size limit exceeded, changes collapsed.

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

+55 −52

Original line number	Diff line number	Diff line
		@@ -78,14 +78,14 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		// We might want to turn this off if we cannot get a guarantee that the screen
		// actually turns on and starts showing new content after the call to set the
		// screen state returns. Playing the animation can also be somewhat slow.
		private static final boolean USE_ELECTRON_BEAM_ON_ANIMATION = false;
		private static final boolean USE_COLOR_FADE_ON_ANIMATION = false;


		// The minimum reduction in brightness when dimmed.
		private static final int SCREEN_DIM_MINIMUM_REDUCTION = 10;

		private static final int ELECTRON_BEAM_ON_ANIMATION_DURATION_MILLIS = 250;
		private static final int ELECTRON_BEAM_OFF_ANIMATION_DURATION_MILLIS = 400;
		private static final int COLOR_FADE_ON_ANIMATION_DURATION_MILLIS = 250;
		private static final int COLOR_FADE_OFF_ANIMATION_DURATION_MILLIS = 600;

		private static final int MSG_UPDATE_POWER_STATE = 1;
		private static final int MSG_PROXIMITY_SENSOR_DEBOUNCED = 2;
		@@ -107,6 +107,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call

		private final Object mLock = new Object();

		private final Context mContext;

		// Our handler.
		private final DisplayControllerHandler mHandler;

		@@ -146,7 +148,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call

		// True if we should fade the screen while turning it off, false if we should play
		// a stylish electron beam animation instead.
		private boolean mElectronBeamFadesConfig;
		private boolean mColorFadeFadesConfig;

		// The pending power request.
		// Initially null until the first call to requestPowerState.
		@@ -223,8 +225,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		private AutomaticBrightnessController mAutomaticBrightnessController;

		// Animators.
		private ObjectAnimator mElectronBeamOnAnimator;
		private ObjectAnimator mElectronBeamOffAnimator;
		private ObjectAnimator mColorFadeOnAnimator;
		private ObjectAnimator mColorFadeOffAnimator;
		private RampAnimator<DisplayPowerState> mScreenBrightnessRampAnimator;

		/**
		@@ -240,6 +242,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		mLights = LocalServices.getService(LightsManager.class);
		mSensorManager = sensorManager;
		mBlanker = blanker;
		mContext = context;

		final Resources resources = context.getResources();

		@@ -287,7 +290,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call

		mScreenBrightnessRangeMinimum = screenBrightnessRangeMinimum;

		mElectronBeamFadesConfig = resources.getBoolean(
		mColorFadeFadesConfig = resources.getBoolean(
		com.android.internal.R.bool.config_animateScreenLights);

		if (!DEBUG_PRETEND_PROXIMITY_SENSOR_ABSENT) {
		@@ -378,17 +381,17 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		// In the future, we might manage multiple displays independently.
		mPowerState = new DisplayPowerState(mBlanker,
		mLights.getLight(LightsManager.LIGHT_ID_BACKLIGHT),
		new ElectronBeam(Display.DEFAULT_DISPLAY));
		new ColorFade(Display.DEFAULT_DISPLAY));

		mElectronBeamOnAnimator = ObjectAnimator.ofFloat(
		mPowerState, DisplayPowerState.ELECTRON_BEAM_LEVEL, 0.0f, 1.0f);
		mElectronBeamOnAnimator.setDuration(ELECTRON_BEAM_ON_ANIMATION_DURATION_MILLIS);
		mElectronBeamOnAnimator.addListener(mAnimatorListener);
		mColorFadeOnAnimator = ObjectAnimator.ofFloat(
		mPowerState, DisplayPowerState.COLOR_FADE_LEVEL, 0.0f, 1.0f);
		mColorFadeOnAnimator.setDuration(COLOR_FADE_ON_ANIMATION_DURATION_MILLIS);
		mColorFadeOnAnimator.addListener(mAnimatorListener);

		mElectronBeamOffAnimator = ObjectAnimator.ofFloat(
		mPowerState, DisplayPowerState.ELECTRON_BEAM_LEVEL, 1.0f, 0.0f);
		mElectronBeamOffAnimator.setDuration(ELECTRON_BEAM_OFF_ANIMATION_DURATION_MILLIS);
		mElectronBeamOffAnimator.addListener(mAnimatorListener);
		mColorFadeOffAnimator = ObjectAnimator.ofFloat(
		mPowerState, DisplayPowerState.COLOR_FADE_LEVEL, 1.0f, 0.0f);
		mColorFadeOffAnimator.setDuration(COLOR_FADE_OFF_ANIMATION_DURATION_MILLIS);
		mColorFadeOffAnimator.addListener(mAnimatorListener);

		mScreenBrightnessRampAnimator = new RampAnimator<DisplayPowerState>(
		mPowerState, DisplayPowerState.SCREEN_BRIGHTNESS);
		@@ -600,34 +603,34 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		// Wait for previous off animation to complete beforehand.
		// It is relatively short but if we cancel it and switch to the
		// on animation immediately then the results are pretty ugly.
		if (!mElectronBeamOffAnimator.isStarted()) {
		if (!mColorFadeOffAnimator.isStarted()) {
		// Turn the screen on. The contents of the screen may not yet
		// be visible if the electron beam has not been dismissed because
		// its last frame of animation is solid black.
		setScreenState(Display.STATE_ON);
		if (mPowerRequest.blockScreenOn
		&& mPowerState.getElectronBeamLevel() == 0.0f) {
		&& mPowerState.getColorFadeLevel() == 0.0f) {
		blockScreenOn();
		} else {
		unblockScreenOn();
		if (USE_ELECTRON_BEAM_ON_ANIMATION && mPowerRequest.isBrightOrDim()) {
		if (USE_COLOR_FADE_ON_ANIMATION && mPowerRequest.isBrightOrDim()) {
		// Perform screen on animation.
		if (!mElectronBeamOnAnimator.isStarted()) {
		if (mPowerState.getElectronBeamLevel() == 1.0f) {
		mPowerState.dismissElectronBeam();
		} else if (mPowerState.prepareElectronBeam(
		mElectronBeamFadesConfig ?
		ElectronBeam.MODE_FADE :
		ElectronBeam.MODE_WARM_UP)) {
		mElectronBeamOnAnimator.start();
		if (!mColorFadeOnAnimator.isStarted()) {
		if (mPowerState.getColorFadeLevel() == 1.0f) {
		mPowerState.dismissColorFade();
		} else if (mPowerState.prepareColorFade(mContext,
		mColorFadeFadesConfig ?
		ColorFade.MODE_FADE :
		ColorFade.MODE_WARM_UP)) {
		mColorFadeOnAnimator.start();
		} else {
		mElectronBeamOnAnimator.end();
		mColorFadeOnAnimator.end();
		}
		}
		} else {
		// Skip screen on animation.
		mPowerState.setElectronBeamLevel(1.0f);
		mPowerState.dismissElectronBeam();
		mPowerState.setColorFadeLevel(1.0f);
		mPowerState.dismissColorFade();
		}
		}
		}
		@@ -640,8 +643,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		\|\| mPowerState.getScreenState() != Display.STATE_ON) {
		// Set screen state and dismiss the black surface without fanfare.
		setScreenState(state);
		mPowerState.setElectronBeamLevel(1.0f);
		mPowerState.dismissElectronBeam();
		mPowerState.setColorFadeLevel(1.0f);
		mPowerState.dismissColorFade();
		}
		} else if (state == Display.STATE_DOZE_SUSPEND) {
		// Want screen dozing and suspended.
		@@ -652,27 +655,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		\|\| mPowerState.getScreenState() == Display.STATE_DOZE_SUSPEND) {
		// Set screen state and dismiss the black surface without fanfare.
		setScreenState(state);
		mPowerState.setElectronBeamLevel(1.0f);
		mPowerState.dismissElectronBeam();
		mPowerState.setColorFadeLevel(1.0f);
		mPowerState.dismissColorFade();
		}
		} else {
		// Want screen off.
		// Wait for previous on animation to complete beforehand.
		unblockScreenOn();
		if (!mElectronBeamOnAnimator.isStarted()) {
		if (!mColorFadeOnAnimator.isStarted()) {
		if (mPowerRequest.policy == DisplayPowerRequest.POLICY_OFF) {
		// Perform screen off animation.
		if (!mElectronBeamOffAnimator.isStarted()) {
		if (mPowerState.getElectronBeamLevel() == 0.0f) {
		if (!mColorFadeOffAnimator.isStarted()) {
		if (mPowerState.getColorFadeLevel() == 0.0f) {
		setScreenState(Display.STATE_OFF);
		} else if (mPowerState.prepareElectronBeam(
		mElectronBeamFadesConfig ?
		ElectronBeam.MODE_FADE :
		ElectronBeam.MODE_COOL_DOWN)
		} else if (mPowerState.prepareColorFade(mContext,
		mColorFadeFadesConfig ?
		ColorFade.MODE_FADE :
		ColorFade.MODE_COOL_DOWN)
		&& mPowerState.getScreenState() != Display.STATE_OFF) {
		mElectronBeamOffAnimator.start();
		mColorFadeOffAnimator.start();
		} else {
		mElectronBeamOffAnimator.end();
		mColorFadeOffAnimator.end();
		}
		}
		} else {
		@@ -687,8 +690,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		// which will be handled asynchronously.
		if (mustNotify
		&& !mScreenOnWasBlocked
		&& !mElectronBeamOnAnimator.isStarted()
		&& !mElectronBeamOffAnimator.isStarted()
		&& !mColorFadeOnAnimator.isStarted()
		&& !mColorFadeOffAnimator.isStarted()
		&& !mScreenBrightnessRampAnimator.isAnimating()
		&& mPowerState.waitUntilClean(mCleanListener)) {
		synchronized (mLock) {
		@@ -936,13 +939,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		pw.println(" mScreenBrightnessRampAnimator.isAnimating()=" +
		mScreenBrightnessRampAnimator.isAnimating());

		if (mElectronBeamOnAnimator != null) {
		pw.println(" mElectronBeamOnAnimator.isStarted()=" +
		mElectronBeamOnAnimator.isStarted());
		if (mColorFadeOnAnimator != null) {
		pw.println(" mColorFadeOnAnimator.isStarted()=" +
		mColorFadeOnAnimator.isStarted());
		}
		if (mElectronBeamOffAnimator != null) {
		pw.println(" mElectronBeamOffAnimator.isStarted()=" +
		mElectronBeamOffAnimator.isStarted());
		if (mColorFadeOffAnimator != null) {
		pw.println(" mColorFadeOffAnimator.isStarted()=" +
		mColorFadeOffAnimator.isStarted());
		}

		if (mPowerState != null) {