Merge "Move boot color sysprop parsing to after loading zips." (1c5cbd49) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.cpp

+25 −22

Original line number	Diff line number	Diff line
		@@ -728,22 +728,6 @@ void BootAnimation::initShaders() {
		glVertexAttribPointer(uvLocation, 2, GL_FLOAT, GL_FALSE, 0, quadUVs);
		glEnableVertexAttribArray(uvLocation);

		if (dynamicColoringEnabled) {
		glUseProgram(mImageShader);
		SLOGI("[BootAnimation] Dynamically coloring boot animation.");
		for (int i = 0; i < DYNAMIC_COLOR_COUNT; i++) {
		float *startColor = mAnimation->startColors[i];
		float *endColor = mAnimation->endColors[i];
		glUniform4f(glGetUniformLocation(mImageShader,
		(U_START_COLOR_PREFIX + std::to_string(i)).c_str()),
		startColor[0], startColor[1], startColor[2], 1 /* alpha */);
		glUniform4f(glGetUniformLocation(mImageShader,
		(U_END_COLOR_PREFIX + std::to_string(i)).c_str()),
		endColor[0], endColor[1], endColor[2], 1 /* alpha */);
		}
		mImageColorProgressLocation = glGetUniformLocation(mImageShader, U_COLOR_PROGRESS);
		}

		// Initialize text shader.
		mTextShader = linkShader(vertexShader, textFragmentShader);
		positionLocation = glGetAttribLocation(mTextShader, A_POSITION);
		@@ -1179,12 +1163,6 @@ bool BootAnimation::parseAnimationDesc(Animation& animation) {
		s = ++endl;
		}

		for (int i = 0; i < DYNAMIC_COLOR_COUNT; i++) {
		parseColorDecimalString(
		android::base::GetProperty("persist.bootanim.color" + std::to_string(i + 1), ""),
		animation.endColors[i], animation.startColors[i]);
		}

		return true;
		}

		@@ -1361,6 +1339,10 @@ bool BootAnimation::movie() {
		mTimeCheckThread->run("BootAnimation::TimeCheckThread", PRIORITY_NORMAL);
		}

		if (mAnimation != nullptr && mAnimation->dynamicColoringEnabled) {
		initDynamicColors();
		}

		playAnimation(*mAnimation);

		if (mTimeCheckThread != nullptr) {
		@@ -1414,6 +1396,27 @@ void BootAnimation::drawTexturedQuad(float xStart, float yStart, float width, fl
		sizeof(quadPositions) / sizeof(quadPositions[0]) / 2);
		}

		void BootAnimation::initDynamicColors() {
		for (int i = 0; i < DYNAMIC_COLOR_COUNT; i++) {
		parseColorDecimalString(
		android::base::GetProperty("persist.bootanim.color" + std::to_string(i + 1), ""),
		mAnimation->endColors[i], mAnimation->startColors[i]);
		}
		glUseProgram(mImageShader);
		SLOGI("[BootAnimation] Dynamically coloring boot animation.");
		for (int i = 0; i < DYNAMIC_COLOR_COUNT; i++) {
		float *startColor = mAnimation->startColors[i];
		float *endColor = mAnimation->endColors[i];
		glUniform4f(glGetUniformLocation(mImageShader,
		(U_START_COLOR_PREFIX + std::to_string(i)).c_str()),
		startColor[0], startColor[1], startColor[2], 1 /* alpha */);
		glUniform4f(glGetUniformLocation(mImageShader,
		(U_END_COLOR_PREFIX + std::to_string(i)).c_str()),
		endColor[0], endColor[1], endColor[2], 1 /* alpha */);
		}
		mImageColorProgressLocation = glGetUniformLocation(mImageShader, U_COLOR_PROGRESS);
		}

		bool BootAnimation::playAnimation(const Animation& animation) {
		const size_t pcount = animation.parts.size();
		nsecs_t frameDuration = s2ns(1) / animation.fps;

cmds/bootanimation/BootAnimation.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,7 @@ private:
		void checkExit();

		void handleViewport(nsecs_t timestep);
		void initDynamicColors();

		sp<SurfaceComposerClient> mSession;
		AssetManager mAssets;