diff options
Diffstat (limited to 'sample/src/main/java/example')
| -rw-r--r-- | sample/src/main/java/example/zxing/MainActivity.java | 3 | ||||
| -rw-r--r-- | sample/src/main/java/example/zxing/ToolbarCaptureActivity.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java index 7dba1610..898f71fb 100644 --- a/sample/src/main/java/example/zxing/MainActivity.java +++ b/sample/src/main/java/example/zxing/MainActivity.java @@ -5,6 +5,7 @@ import android.hardware.Camera; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -16,7 +17,7 @@ import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; -public class MainActivity extends ActionBarActivity { +public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java index d11fe530..dde53d78 100644 --- a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java +++ b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java @@ -2,6 +2,7 @@ package example.zxing; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.KeyEvent; @@ -11,7 +12,7 @@ import com.journeyapps.barcodescanner.DecoratedBarcodeView; /** * Sample Activity extending from ActionBarActivity to display a Toolbar. */ -public class ToolbarCaptureActivity extends ActionBarActivity { +public class ToolbarCaptureActivity extends AppCompatActivity { private CaptureManager capture; private DecoratedBarcodeView barcodeScannerView; |
