diff options
Diffstat (limited to 'tests/CameraPrewarmTest/src/com/google/android')
-rw-r--r-- | tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/CameraActivity.java | 2 | ||||
-rw-r--r-- | tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/PrewarmService.java (renamed from tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/PrewarmReceiver.java) | 20 |
2 files changed, 9 insertions, 13 deletions
diff --git a/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/CameraActivity.java b/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/CameraActivity.java index 4d22234..0b43666 100644 --- a/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/CameraActivity.java +++ b/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/CameraActivity.java @@ -19,7 +19,6 @@ package com.google.android.test.cameraprewarm; import android.app.Activity; import android.os.Bundle; import android.util.Log; -import android.view.WindowManager; import com.google.android.test.cameraprewarm.R; @@ -31,7 +30,6 @@ public class CameraActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.camera_activity); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD); Log.i(TAG, "Activity created"); } } diff --git a/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/PrewarmReceiver.java b/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/PrewarmService.java index d49f96d..d080b1a 100644 --- a/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/PrewarmReceiver.java +++ b/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/PrewarmService.java @@ -16,20 +16,18 @@ package com.google.android.test.cameraprewarm; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.provider.MediaStore; +import android.service.media.CameraPrewarmService; import android.util.Log; -public class PrewarmReceiver extends BroadcastReceiver { +public class PrewarmService extends CameraPrewarmService { @Override - public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(MediaStore.ACTION_STILL_IMAGE_CAMERA_PREWARM)) { - Log.i(CameraActivity.TAG, "Prewarm received"); - } else if (intent.getAction().equals(MediaStore.ACTION_STILL_IMAGE_CAMERA_COOLDOWN)){ - Log.i(CameraActivity.TAG, "Cooldown received"); - } + public void onPrewarm() { + Log.i("PrewarmService", "Warming up"); + } + + @Override + public void onCooldown(boolean cameraIntentFired) { + Log.i("PrewarmService", "Cooling down fired=" + cameraIntentFired); } } |