mirror of
https://github.com/zxing/zxing.git
synced 2025-03-05 20:48:51 -08:00
Suppress most deprecation warnings due to old camera API; remove call to old cookie manager
This commit is contained in:
parent
0ec5b9a260
commit
484ff7edcf
|
@ -16,7 +16,6 @@
|
|||
|
||||
package com.google.zxing.client.android.camera;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.graphics.Point;
|
||||
import android.graphics.Rect;
|
||||
import android.hardware.Camera;
|
||||
|
@ -37,7 +36,7 @@ import java.util.regex.Pattern;
|
|||
*
|
||||
* @author Sean Owen
|
||||
*/
|
||||
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
public final class CameraConfigurationUtils {
|
||||
|
||||
private static final String TAG = "CameraConfiguration";
|
||||
|
|
|
@ -24,8 +24,6 @@ import android.util.Log;
|
|||
import android.view.KeyEvent;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.webkit.CookieManager;
|
||||
import android.webkit.CookieSyncManager;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ListView;
|
||||
import android.widget.TextView;
|
||||
|
@ -92,10 +90,6 @@ public final class SearchBookContentsActivity extends Activity {
|
|||
public void onCreate(Bundle icicle) {
|
||||
super.onCreate(icicle);
|
||||
|
||||
// Make sure that expired cookies are removed on launch.
|
||||
CookieSyncManager.createInstance(this);
|
||||
CookieManager.getInstance().removeExpiredCookie();
|
||||
|
||||
Intent intent = getIntent();
|
||||
if (intent == null || !Intents.SearchBookContents.ACTION.equals(intent.getAction())) {
|
||||
finish();
|
||||
|
|
|
@ -29,6 +29,7 @@ import java.util.concurrent.RejectedExecutionException;
|
|||
|
||||
import com.google.zxing.client.android.PreferencesActivity;
|
||||
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
final class AutoFocusManager implements Camera.AutoFocusCallback {
|
||||
|
||||
private static final String TAG = AutoFocusManager.class.getSimpleName();
|
||||
|
|
|
@ -34,6 +34,7 @@ import com.google.zxing.client.android.camera.open.OpenCamera;
|
|||
* A class which deals with reading, parsing, and setting the camera parameters which are used to
|
||||
* configure the camera hardware.
|
||||
*/
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
final class CameraConfigurationManager {
|
||||
|
||||
private static final String TAG = "CameraConfiguration";
|
||||
|
|
|
@ -36,6 +36,7 @@ import java.io.IOException;
|
|||
*
|
||||
* @author dswitkin@google.com (Daniel Switkin)
|
||||
*/
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
public final class CameraManager {
|
||||
|
||||
private static final String TAG = CameraManager.class.getSimpleName();
|
||||
|
|
|
@ -22,6 +22,7 @@ import android.os.Handler;
|
|||
import android.os.Message;
|
||||
import android.util.Log;
|
||||
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
final class PreviewCallback implements Camera.PreviewCallback {
|
||||
|
||||
private static final String TAG = PreviewCallback.class.getSimpleName();
|
||||
|
|
|
@ -21,6 +21,7 @@ import android.hardware.Camera;
|
|||
/**
|
||||
* Represents an open {@link Camera} and its metadata, like facing direction and orientation.
|
||||
*/
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
public final class OpenCamera {
|
||||
|
||||
private final int index;
|
||||
|
|
|
@ -22,6 +22,7 @@ import android.util.Log;
|
|||
/**
|
||||
* Abstraction over the {@link Camera} API that helps open them and return their metadata.
|
||||
*/
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
public final class OpenCameraInterface {
|
||||
|
||||
private static final String TAG = OpenCameraInterface.class.getName();
|
||||
|
|
|
@ -45,6 +45,7 @@ import java.nio.charset.Charset;
|
|||
/**
|
||||
* Main test app activity.
|
||||
*/
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
public final class ZXingTestActivity extends Activity {
|
||||
|
||||
private static final String TAG = ZXingTestActivity.class.getSimpleName();
|
||||
|
|
|
@ -24,6 +24,7 @@ import com.google.zxing.client.android.camera.CameraConfigurationUtils;
|
|||
/**
|
||||
* @author Sean Owen
|
||||
*/
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
final class CameraConfigurationManager {
|
||||
|
||||
private static final String TAG = "CameraConfiguration";
|
||||
|
|
|
@ -42,6 +42,7 @@ import java.io.IOException;
|
|||
/**
|
||||
* @author Sean Owen
|
||||
*/
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
public final class CaptureActivity extends Activity implements SurfaceHolder.Callback {
|
||||
|
||||
private static final String TAG = CaptureActivity.class.getSimpleName();
|
||||
|
|
|
@ -39,6 +39,7 @@ import java.util.concurrent.CountDownLatch;
|
|||
/**
|
||||
* @author Sean Owen
|
||||
*/
|
||||
@SuppressWarnings("deprecation") // camera APIs
|
||||
final class DecodeRunnable implements Runnable, Camera.PreviewCallback {
|
||||
|
||||
private static final String TAG = DecodeRunnable.class.getSimpleName();
|
||||
|
|
Loading…
Reference in a new issue