Merge "Minor app updates for RS. force RSTest to portrait." (2c6f3448) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -352,7 +352,7 @@ public class ImageProcessingActivity extends Activity
		mSaturationSeekBar.setProgress(50);

		mBenchmarkResult = (TextView) findViewById(R.id.benchmarkText);
		mBenchmarkResult.setText("Benchmark no yet run");
		mBenchmarkResult.setText("Benchmark not yet run");
		}

		public void surfaceCreated(SurfaceHolder holder) {

+2 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,8 @@
		<application
		android:label="_RS_Test"
		android:icon="@drawable/test_pattern">
		<activity android:name="RSTest">
		<activity android:name="RSTest"
		android:screenOrientation="portrait">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />

+2 −3

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ public class RSTest extends Activity {
		@Override
		protected void onResume() {
		// Ideally a game should implement onResume() and onPause()
		// to take appropriate action when the activity looses focus
		// to take appropriate action when the activity loses focus
		super.onResume();
		mView.onResume();
		}
		@@ -69,7 +69,7 @@ public class RSTest extends Activity {
		@Override
		protected void onPause() {
		// Ideally a game should implement onResume() and onPause()
		// to take appropriate action when the activity looses focus
		// to take appropriate action when the activity loses focus
		super.onPause();
		mView.onPause();
		}
		@@ -82,4 +82,3 @@ public class RSTest extends Activity {


		}