Merge "Code cleanup to make formatting consistent across all the renderscript files." (95ab69f4) · Commits · e / os / android_frameworks_base

libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java

+19 −25

Original line number	Diff line number	Diff line
		@@ -258,30 +258,24 @@ public class ImageProcessingActivity extends Activity
		mRadius = (int)fRadius;

		mScript.set_radius(mRadius);
		}
		else if(seekBar == mInBlackSeekBar) {
		} else if (seekBar == mInBlackSeekBar) {
		mInBlack = (float)progress;
		mScriptVBlur.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite);
		}
		else if(seekBar == mOutBlackSeekBar) {
		} else if (seekBar == mOutBlackSeekBar) {
		mOutBlack = (float)progress;
		mScriptVBlur.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite);
		}
		else if(seekBar == mInWhiteSeekBar) {
		} else if (seekBar == mInWhiteSeekBar) {
		mInWhite = (float)progress + 127.0f;
		mScriptVBlur.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite);
		}
		else if(seekBar == mOutWhiteSeekBar) {
		} else if (seekBar == mOutWhiteSeekBar) {
		mOutWhite = (float)progress + 127.0f;
		mScriptVBlur.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite);
		}
		else if(seekBar == mGammaSeekBar) {
		} else if (seekBar == mGammaSeekBar) {
		mGamma = (float)progress/100.0f;
		mGamma = Math.max(mGamma, 0.1f);
		mGamma = 1.0f / mGamma;
		mScriptVBlur.invoke_setGamma(mGamma);
		}
		else if(seekBar == mSaturationSeekBar) {
		} else if (seekBar == mSaturationSeekBar) {
		mSaturation = (float)progress / 50.0f;
		mScriptVBlur.invoke_setSaturation(mSaturation);
		}

+5 −6

Original line number	Diff line number	Diff line
		@@ -188,8 +188,7 @@ public class SceneGraphRS {
		FileA3D.IndexEntry entry = model.getIndexEntry(0);
		if (entry == null \|\| entry.getClassID() != FileA3D.ClassID.MESH) {
		Log.e("rs", "could not load model");
		}
		else {
		} else {
		mMesh = (Mesh)entry.getObject();
		mScript.set_gTestMesh(mMesh);
		}

+5 −6

Original line number	Diff line number	Diff line
		@@ -150,8 +150,7 @@ public class SimpleModelRS {
		FileA3D.IndexEntry entry = model.getIndexEntry(0);
		if (entry == null \|\| entry.getClassID() != FileA3D.ClassID.MESH) {
		Log.e("rs", "could not load model");
		}
		else {
		} else {
		mMesh = (Mesh)entry.getObject();
		mScript.set_gTestMesh(mMesh);
		}

+8 −9

Original line number	Diff line number	Diff line
		@@ -85,8 +85,7 @@ void root(const void v_in, void v_out, const void *usrData, uint32_t x, uint32
		rsMatrixLoad(globalMat, parent->mat);
		rsMatrixMultiply(globalMat, localMat);
		}
		}
		else {
		} else {
		rsMatrixLoad(globalMat, localMat);
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -87,8 +87,7 @@ public class RsListView extends RSSurfaceView {
		if (act == ev.ACTION_DOWN) {
		mRender.onActionDown((int)ev.getX(), (int)ev.getY());
		ret = true;
		}
		else if (act == ev.ACTION_MOVE) {
		} else if (act == ev.ACTION_MOVE) {
		mRender.onActionMove((int)ev.getX(), (int)ev.getY());
		ret = true;
		}