diff --git a/CHANGES.md b/CHANGES.md
index 64623c3ae..dd5340a2d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,6 @@
+### 3.3.0 (Pending)
+
+* Rename CompoundBarcodeView to DecoratedBarcodeView.
 
 ### 3.2.0 (2016-02-06)
 
diff --git a/EMBEDDING.md b/EMBEDDING.md
index c647f42db..038486bda 100644
--- a/EMBEDDING.md
+++ b/EMBEDDING.md
@@ -3,7 +3,7 @@
 For more control over the UI or scanning behaviour, some components may be used directly:
 
 * BarcodeView: Handles displaying the preview and decoding of the barcodes.
-* CompoundBarcodeView: Combines BarcodeView with a viewfinder for feedback, as well as some status /
+* DecoratedBarcodeView: Combines BarcodeView with a viewfinder for feedback, as well as some status /
   prompt text.
 * CaptureManager: Manages the InactivityTimer, BeepManager, orientation lock, and returning of the
   barcode result.
@@ -31,7 +31,7 @@ SurfaceView and other components, the camera preview may end up displaying outsi
 and over other components. This happens especially when:
 
 1. Placing the scanner inside a dialog, or:
-2. Other components are placed before the (Compound)BarcodeView, resulting in a lower z-order.
+2. Other components are placed before the (Decorated)BarcodeView, resulting in a lower z-order.
 
 For these cases we have two solutions:
 
@@ -50,7 +50,7 @@ The default is to:
 You can override these options:
 
 ```xml
-<com.journeyapps.barcodescanner.CompoundBarcodeView
+<com.journeyapps.barcodescanner.DecoratedBarcodeView
         android:layout_width="..."
         android:layout_height="..."
         app:zxing_use_texture_view="false" (defaults to true, only has an effect on Android API 14+)
diff --git a/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java b/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java
index 783eb892b..872020f15 100644
--- a/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java
+++ b/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java
@@ -1,10 +1,8 @@
 package example.zxing;
 
 import android.app.Activity;
-import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ImageView;
@@ -12,7 +10,7 @@
 import com.google.zxing.ResultPoint;
 import com.journeyapps.barcodescanner.BarcodeCallback;
 import com.journeyapps.barcodescanner.BarcodeResult;
-import com.journeyapps.barcodescanner.CompoundBarcodeView;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 
 import java.util.List;
 
@@ -22,7 +20,7 @@
  */
 public class ContinuousCaptureActivity extends Activity {
     private static final String TAG = ContinuousCaptureActivity.class.getSimpleName();
-    private CompoundBarcodeView barcodeView;
+    private DecoratedBarcodeView barcodeView;
 
     private BarcodeCallback callback = new BarcodeCallback() {
         @Override
@@ -46,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.continuous_scan);
 
-        barcodeView = (CompoundBarcodeView) findViewById(R.id.barcode_scanner);
+        barcodeView = (DecoratedBarcodeView) findViewById(R.id.barcode_scanner);
         barcodeView.decodeContinuous(callback);
     }
 
diff --git a/sample/src/main/java/example/zxing/CustomScannerActivity.java b/sample/src/main/java/example/zxing/CustomScannerActivity.java
index bc5c4dc1b..867c2de33 100644
--- a/sample/src/main/java/example/zxing/CustomScannerActivity.java
+++ b/sample/src/main/java/example/zxing/CustomScannerActivity.java
@@ -8,16 +8,16 @@
 import android.widget.Button;
 
 import com.journeyapps.barcodescanner.CaptureManager;
-import com.journeyapps.barcodescanner.CompoundBarcodeView;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 
 /**
  * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
  */
 public class CustomScannerActivity extends Activity implements
-        CompoundBarcodeView.TorchListener {
+        DecoratedBarcodeView.TorchListener {
 
     private CaptureManager capture;
-    private CompoundBarcodeView barcodeScannerView;
+    private DecoratedBarcodeView barcodeScannerView;
     private Button switchFlashlightButton;
 
     @Override
@@ -25,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_custom_scanner);
 
-        barcodeScannerView = (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner);
+        barcodeScannerView = (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner);
         barcodeScannerView.setTorchListener(this);
 
         switchFlashlightButton = (Button)findViewById(R.id.switch_flashlight);
diff --git a/sample/src/main/java/example/zxing/SmallCaptureActivity.java b/sample/src/main/java/example/zxing/SmallCaptureActivity.java
index 87b6b0cea..c4baa8ed4 100644
--- a/sample/src/main/java/example/zxing/SmallCaptureActivity.java
+++ b/sample/src/main/java/example/zxing/SmallCaptureActivity.java
@@ -1,15 +1,15 @@
 package example.zxing;
 
 import com.journeyapps.barcodescanner.CaptureActivity;
-import com.journeyapps.barcodescanner.CompoundBarcodeView;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 
 /**
  * This activity has a margin.
  */
 public class SmallCaptureActivity extends CaptureActivity {
     @Override
-    protected CompoundBarcodeView initializeContent() {
+    protected DecoratedBarcodeView initializeContent() {
         setContentView(R.layout.capture_small);
-        return (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner);
+        return (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner);
     }
 }
diff --git a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
index f497d1175..d11fe530d 100644
--- a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
+++ b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
@@ -6,14 +6,14 @@
 import android.view.KeyEvent;
 
 import com.journeyapps.barcodescanner.CaptureManager;
-import com.journeyapps.barcodescanner.CompoundBarcodeView;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 
 /**
  * Sample Activity extending from ActionBarActivity to display a Toolbar.
  */
 public class ToolbarCaptureActivity extends ActionBarActivity {
     private CaptureManager capture;
-    private CompoundBarcodeView barcodeScannerView;
+    private DecoratedBarcodeView barcodeScannerView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -25,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        barcodeScannerView = (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner);
+        barcodeScannerView = (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner);
 
         capture = new CaptureManager(this, barcodeScannerView);
         capture.initializeFromIntent(getIntent(), savedInstanceState);
diff --git a/sample/src/main/res/layout/activity_custom_scanner.xml b/sample/src/main/res/layout/activity_custom_scanner.xml
index b7a59f6ce..71f6603de 100644
--- a/sample/src/main/res/layout/activity_custom_scanner.xml
+++ b/sample/src/main/res/layout/activity_custom_scanner.xml
@@ -6,12 +6,12 @@
     android:layout_height="match_parent"
     tools:context="example.zxing.CustomScannerActivity">
 
-    <com.journeyapps.barcodescanner.CompoundBarcodeView
+    <com.journeyapps.barcodescanner.DecoratedBarcodeView
         android:id="@+id/zxing_barcode_scanner"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:zxing_scanner_layout="@layout/custom_barcode_scanner">
-    </com.journeyapps.barcodescanner.CompoundBarcodeView>
+    </com.journeyapps.barcodescanner.DecoratedBarcodeView>
 
     <Button
         android:id="@+id/switch_flashlight"
diff --git a/sample/src/main/res/layout/capture_appcompat.xml b/sample/src/main/res/layout/capture_appcompat.xml
index 93acdc655..4c6704636 100644
--- a/sample/src/main/res/layout/capture_appcompat.xml
+++ b/sample/src/main/res/layout/capture_appcompat.xml
@@ -32,7 +32,7 @@
         android:layout_alignParentLeft="true"
         app:theme="@style/ThemeOverlay.AppCompat.ActionBar"/>
 
-    <com.journeyapps.barcodescanner.CompoundBarcodeView
+    <com.journeyapps.barcodescanner.DecoratedBarcodeView
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_below="@+id/my_awesome_toolbar"
@@ -41,7 +41,7 @@
         app:zxing_use_texture_view="true"/>
 
 
-    <!-- Sample for a footer. Also add to CompoundBarcodeView: android:layout_above="@+id/footer" -->
+    <!-- Sample for a footer. Also add to DecoratedBarcodeView: android:layout_above="@+id/footer" -->
     <!-- <TextView
         android:id="@+id/footer"
         android:layout_width="match_parent"
diff --git a/sample/src/main/res/layout/capture_small.xml b/sample/src/main/res/layout/capture_small.xml
index 4046d93d4..efe2d4a2e 100644
--- a/sample/src/main/res/layout/capture_small.xml
+++ b/sample/src/main/res/layout/capture_small.xml
@@ -21,7 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <com.journeyapps.barcodescanner.CompoundBarcodeView
+    <com.journeyapps.barcodescanner.DecoratedBarcodeView
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
diff --git a/sample/src/main/res/layout/continuous_scan.xml b/sample/src/main/res/layout/continuous_scan.xml
index e1b9356d7..d7876458e 100644
--- a/sample/src/main/res/layout/continuous_scan.xml
+++ b/sample/src/main/res/layout/continuous_scan.xml
@@ -3,14 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.journeyapps.barcodescanner.CompoundBarcodeView
+    <com.journeyapps.barcodescanner.DecoratedBarcodeView
         android:id="@+id/barcode_scanner"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_above="@+id/buttonsLayout"
         android:layout_alignParentTop="true">
 
-    </com.journeyapps.barcodescanner.CompoundBarcodeView>
+    </com.journeyapps.barcodescanner.DecoratedBarcodeView>
 
     <LinearLayout
         android:orientation="vertical"
diff --git a/zxing-android-embedded/res/layout/zxing_capture.xml b/zxing-android-embedded/res/layout/zxing_capture.xml
index ede4e58ba..799785f27 100644
--- a/zxing-android-embedded/res/layout/zxing_capture.xml
+++ b/zxing-android-embedded/res/layout/zxing_capture.xml
@@ -21,7 +21,7 @@
     <!--
     This Activity is typically full-screen. Therefore we can safely use centerCrop scaling with
     a SurfaceView, without fear of weird artifacts. -->
-    <com.journeyapps.barcodescanner.CompoundBarcodeView
+    <com.journeyapps.barcodescanner.DecoratedBarcodeView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/zxing_barcode_scanner"
diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java
index 6bd74ea15..3d8ee55d8 100644
--- a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java
+++ b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java
@@ -697,8 +697,7 @@ private void initCamera() {
             return;
         }
 
-        cameraInstance = new CameraInstance(getContext());
-        cameraInstance.setCameraSettings(cameraSettings);
+        cameraInstance = createCameraInstance();
 
         cameraInstance.setReadyHandler(stateHandler);
         cameraInstance.open();
@@ -708,6 +707,19 @@ private void initCamera() {
         openedOrientation = getDisplayRotation();
     }
 
+    /**
+     * Create a new CameraInstance.
+     *
+     * Override to use a custom CameraInstance.
+     *
+     * @return a new CameraInstance
+     */
+    protected CameraInstance createCameraInstance() {
+        CameraInstance cameraInstance = new CameraInstance(getContext());
+        cameraInstance.setCameraSettings(cameraSettings);
+        return cameraInstance;
+    }
+
 
     private void startCameraPreview(CameraSurface surface) {
         if (!previewActive && cameraInstance != null) {
diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureActivity.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureActivity.java
index d59be36eb..09fc58cbf 100644
--- a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureActivity.java
+++ b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureActivity.java
@@ -1,9 +1,7 @@
 package com.journeyapps.barcodescanner;
 
 import android.app.Activity;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
 import android.view.KeyEvent;
 
 import com.google.zxing.client.android.R;
@@ -13,7 +11,7 @@
  */
 public class CaptureActivity extends Activity {
     private CaptureManager capture;
-    private CompoundBarcodeView barcodeScannerView;
+    private DecoratedBarcodeView barcodeScannerView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -31,9 +29,9 @@ protected void onCreate(Bundle savedInstanceState) {
      *
      * @return the CompoundBarcodeView
      */
-    protected CompoundBarcodeView initializeContent() {
+    protected DecoratedBarcodeView initializeContent() {
         setContentView(R.layout.zxing_capture);
-        return (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner);
+        return (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner);
     }
 
     @Override
diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureManager.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureManager.java
index 94a50ad89..37282bef1 100644
--- a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureManager.java
+++ b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureManager.java
@@ -57,7 +57,7 @@ public class CaptureManager {
     private static int cameraPermissionReqCode = 250;
 
     private Activity activity;
-    private CompoundBarcodeView barcodeView;
+    private DecoratedBarcodeView barcodeView;
     private int orientationLock = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
     private static final String SAVED_ORIENTATION_LOCK = "SAVED_ORIENTATION_LOCK";
     private boolean returnBarcodeImagePath = false;
@@ -116,7 +116,7 @@ public void cameraError(Exception error) {
         }
     };
 
-    public CaptureManager(Activity activity, CompoundBarcodeView barcodeView) {
+    public CaptureManager(Activity activity, DecoratedBarcodeView barcodeView) {
         this.activity = activity;
         this.barcodeView = barcodeView;
         barcodeView.getBarcodeView().addStateListener(stateListener);
diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CompoundBarcodeView.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CompoundBarcodeView.java
index b5f03f5af..a9b9050bc 100644
--- a/zxing-android-embedded/src/com/journeyapps/barcodescanner/CompoundBarcodeView.java
+++ b/zxing-android-embedded/src/com/journeyapps/barcodescanner/CompoundBarcodeView.java
@@ -1,268 +1,21 @@
 package com.journeyapps.barcodescanner;
 
 import android.content.Context;
-import android.content.Intent;
-import android.content.res.TypedArray;
 import android.util.AttributeSet;
-import android.view.KeyEvent;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.android.DecodeFormatManager;
-import com.google.zxing.client.android.DecodeHintManager;
-import com.google.zxing.client.android.Intents;
-import com.google.zxing.client.android.R;
-import com.journeyapps.barcodescanner.camera.CameraSettings;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
- * Encapsulates BarcodeView, ViewfinderView and status text.
- *
- * To customize the UI, use BarcodeView and ViewfinderView directly.
+ * Used as an alias for DecoratedBarcodeView, for backwards-compatibility.
  */
-public class CompoundBarcodeView extends FrameLayout {
-    private BarcodeView barcodeView;
-    private ViewfinderView viewFinder;
-    private TextView statusView;
-
-    /**
-     * The instance of @link TorchListener to send events callback.
-     */
-    private TorchListener torchListener;
-
-    private class WrappedCallback implements BarcodeCallback {
-        private BarcodeCallback delegate;
-
-        public WrappedCallback(BarcodeCallback delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void barcodeResult(BarcodeResult result) {
-            delegate.barcodeResult(result);
-        }
-
-        @Override
-        public void possibleResultPoints(List<ResultPoint> resultPoints) {
-            for (ResultPoint point : resultPoints) {
-                viewFinder.addPossibleResultPoint(point);
-            }
-            delegate.possibleResultPoints(resultPoints);
-        }
-    }
-
+public class CompoundBarcodeView extends DecoratedBarcodeView {
     public CompoundBarcodeView(Context context) {
         super(context);
-        initialize();
     }
 
     public CompoundBarcodeView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        initialize(attrs);
     }
 
     public CompoundBarcodeView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        initialize(attrs);
-    }
-
-    /**
-     * Initialize the view with the xml configuration based on styleable attributes.
-     *
-     * @param attrs The attributes to use on view.
-     */
-    private void initialize(AttributeSet attrs) {
-        // Get attributes set on view
-        TypedArray attributes = getContext().obtainStyledAttributes(attrs, R.styleable.zxing_view);
-
-        int scannerLayout = attributes.getResourceId(
-                R.styleable.zxing_view_zxing_scanner_layout, R.layout.zxing_barcode_scanner);
-
-        attributes.recycle();
-
-        inflate(getContext(), scannerLayout, this);
-
-        barcodeView = (BarcodeView) findViewById(R.id.zxing_barcode_surface);
-
-        if (barcodeView == null) {
-            throw new IllegalArgumentException(
-                "There is no a com.journeyapps.barcodescanner.BarcodeView on provided layout " +
-                "with the id \"zxing_barcode_surface\".");
-        }
-
-        // Pass on any preview-related attributes
-        barcodeView.initializeAttributes(attrs);
-
-
-        viewFinder = (ViewfinderView) findViewById(R.id.zxing_viewfinder_view);
-
-        if (viewFinder == null) {
-            throw new IllegalArgumentException(
-                "There is no a com.journeyapps.barcodescanner.ViewfinderView on provided layout " +
-                "with the id \"zxing_viewfinder_view\".");
-        }
-
-        viewFinder.setCameraPreview(barcodeView);
-
-        // statusView is optional
-        statusView = (TextView) findViewById(R.id.zxing_status_view);
-    }
-
-    /**
-     * Initialize with no custom attributes setted.
-     */
-    private void initialize() {
-        initialize(null);
-    }
-
-    /**
-     * Convenience method to initialize camera id, decode formats and prompt message from an intent.
-     *
-     * @param intent the intent, as generated by IntentIntegrator
-     */
-    public void initializeFromIntent(Intent intent) {
-        // Scan the formats the intent requested, and return the result to the calling activity.
-        Set<BarcodeFormat> decodeFormats = DecodeFormatManager.parseDecodeFormats(intent);
-        Map<DecodeHintType, Object> decodeHints = DecodeHintManager.parseDecodeHints(intent);
-
-        CameraSettings settings = new CameraSettings();
-
-        if (intent.hasExtra(Intents.Scan.CAMERA_ID)) {
-            int cameraId = intent.getIntExtra(Intents.Scan.CAMERA_ID, -1);
-            if (cameraId >= 0) {
-                settings.setRequestedCameraId(cameraId);
-            }
-        }
-
-        String customPromptMessage = intent.getStringExtra(Intents.Scan.PROMPT_MESSAGE);
-        if (customPromptMessage != null) {
-            setStatusText(customPromptMessage);
-        }
-
-        String characterSet = intent.getStringExtra(Intents.Scan.CHARACTER_SET);
-
-        MultiFormatReader reader = new MultiFormatReader();
-        reader.setHints(decodeHints);
-
-        barcodeView.setCameraSettings(settings);
-        barcodeView.setDecoderFactory(new DefaultDecoderFactory(decodeFormats, decodeHints, characterSet));
-    }
-
-    public void setStatusText(String text) {
-        // statusView is optional when using a custom layout
-        if(statusView != null) {
-            statusView.setText(text);
-        }
     }
-
-
-    /**
-     * @see BarcodeView#pause()
-     */
-    public void pause() {
-        barcodeView.pause();
-    }
-
-    /**
-     * @see BarcodeView#resume()
-     */
-    public void resume() {
-        barcodeView.resume();
-    }
-
-    public BarcodeView getBarcodeView() {
-        return (BarcodeView) findViewById(R.id.zxing_barcode_surface);
-    }
-
-    public ViewfinderView getViewFinder() {
-        return viewFinder;
-    }
-
-    public TextView getStatusView() {
-        return statusView;
-    }
-
-
-    /**
-     * @see BarcodeView#decodeSingle(BarcodeCallback)
-     */
-    public void decodeSingle(BarcodeCallback callback) {
-        barcodeView.decodeSingle(new WrappedCallback(callback));
-
-    }
-
-    /**
-     * @see BarcodeView#decodeContinuous(BarcodeCallback)
-     */
-    public void decodeContinuous(BarcodeCallback callback) {
-        barcodeView.decodeContinuous(new WrappedCallback(callback));
-    }
-
-    /**
-     * Turn on the device's flashlight.
-     */
-    public void setTorchOn() {
-        barcodeView.setTorch(true);
-
-        if (torchListener != null) {
-            torchListener.onTorchOn();
-        }
-    }
-
-    /**
-     * Turn off the device's flashlight.
-     */
-    public void setTorchOff() {
-        barcodeView.setTorch(false);
-
-        if (torchListener != null) {
-            torchListener.onTorchOff();
-        }
-    }
-
-    /**
-     * Handles focus, camera, volume up and volume down keys.
-     *
-     * Note that this view is not usually focused, so the Activity should call this directly.
-     */
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_FOCUS:
-            case KeyEvent.KEYCODE_CAMERA:
-                // Handle these events so they don't launch the Camera app
-                return true;
-            // Use volume up/down to turn on light
-            case KeyEvent.KEYCODE_VOLUME_DOWN:
-                setTorchOff();
-                return true;
-            case KeyEvent.KEYCODE_VOLUME_UP:
-                setTorchOn();
-                return true;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    public void setTorchListener(TorchListener listener) {
-        this.torchListener = listener;
-    }
-
-    /**
-     * The Listener to torch/fflashlight events (turn on, turn off).
-     */
-    public interface TorchListener {
-
-        void onTorchOn();
-
-        void onTorchOff();
-
-    }
-
 }
diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/DecoratedBarcodeView.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/DecoratedBarcodeView.java
new file mode 100644
index 000000000..74e2d02a8
--- /dev/null
+++ b/zxing-android-embedded/src/com/journeyapps/barcodescanner/DecoratedBarcodeView.java
@@ -0,0 +1,268 @@
+package com.journeyapps.barcodescanner;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.DecodeHintType;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.ResultPoint;
+import com.google.zxing.client.android.DecodeFormatManager;
+import com.google.zxing.client.android.DecodeHintManager;
+import com.google.zxing.client.android.Intents;
+import com.google.zxing.client.android.R;
+import com.journeyapps.barcodescanner.camera.CameraSettings;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Encapsulates BarcodeView, ViewfinderView and status text.
+ *
+ * To customize the UI, use BarcodeView and ViewfinderView directly.
+ */
+public class DecoratedBarcodeView extends FrameLayout {
+    private BarcodeView barcodeView;
+    private ViewfinderView viewFinder;
+    private TextView statusView;
+
+    /**
+     * The instance of @link TorchListener to send events callback.
+     */
+    private TorchListener torchListener;
+
+    private class WrappedCallback implements BarcodeCallback {
+        private BarcodeCallback delegate;
+
+        public WrappedCallback(BarcodeCallback delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void barcodeResult(BarcodeResult result) {
+            delegate.barcodeResult(result);
+        }
+
+        @Override
+        public void possibleResultPoints(List<ResultPoint> resultPoints) {
+            for (ResultPoint point : resultPoints) {
+                viewFinder.addPossibleResultPoint(point);
+            }
+            delegate.possibleResultPoints(resultPoints);
+        }
+    }
+
+    public DecoratedBarcodeView(Context context) {
+        super(context);
+        initialize();
+    }
+
+    public DecoratedBarcodeView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(attrs);
+    }
+
+    public DecoratedBarcodeView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initialize(attrs);
+    }
+
+    /**
+     * Initialize the view with the xml configuration based on styleable attributes.
+     *
+     * @param attrs The attributes to use on view.
+     */
+    private void initialize(AttributeSet attrs) {
+        // Get attributes set on view
+        TypedArray attributes = getContext().obtainStyledAttributes(attrs, R.styleable.zxing_view);
+
+        int scannerLayout = attributes.getResourceId(
+                R.styleable.zxing_view_zxing_scanner_layout, R.layout.zxing_barcode_scanner);
+
+        attributes.recycle();
+
+        inflate(getContext(), scannerLayout, this);
+
+        barcodeView = (BarcodeView) findViewById(R.id.zxing_barcode_surface);
+
+        if (barcodeView == null) {
+            throw new IllegalArgumentException(
+                "There is no a com.journeyapps.barcodescanner.BarcodeView on provided layout " +
+                "with the id \"zxing_barcode_surface\".");
+        }
+
+        // Pass on any preview-related attributes
+        barcodeView.initializeAttributes(attrs);
+
+
+        viewFinder = (ViewfinderView) findViewById(R.id.zxing_viewfinder_view);
+
+        if (viewFinder == null) {
+            throw new IllegalArgumentException(
+                "There is no a com.journeyapps.barcodescanner.ViewfinderView on provided layout " +
+                "with the id \"zxing_viewfinder_view\".");
+        }
+
+        viewFinder.setCameraPreview(barcodeView);
+
+        // statusView is optional
+        statusView = (TextView) findViewById(R.id.zxing_status_view);
+    }
+
+    /**
+     * Initialize with no custom attributes setted.
+     */
+    private void initialize() {
+        initialize(null);
+    }
+
+    /**
+     * Convenience method to initialize camera id, decode formats and prompt message from an intent.
+     *
+     * @param intent the intent, as generated by IntentIntegrator
+     */
+    public void initializeFromIntent(Intent intent) {
+        // Scan the formats the intent requested, and return the result to the calling activity.
+        Set<BarcodeFormat> decodeFormats = DecodeFormatManager.parseDecodeFormats(intent);
+        Map<DecodeHintType, Object> decodeHints = DecodeHintManager.parseDecodeHints(intent);
+
+        CameraSettings settings = new CameraSettings();
+
+        if (intent.hasExtra(Intents.Scan.CAMERA_ID)) {
+            int cameraId = intent.getIntExtra(Intents.Scan.CAMERA_ID, -1);
+            if (cameraId >= 0) {
+                settings.setRequestedCameraId(cameraId);
+            }
+        }
+
+        String customPromptMessage = intent.getStringExtra(Intents.Scan.PROMPT_MESSAGE);
+        if (customPromptMessage != null) {
+            setStatusText(customPromptMessage);
+        }
+
+        String characterSet = intent.getStringExtra(Intents.Scan.CHARACTER_SET);
+
+        MultiFormatReader reader = new MultiFormatReader();
+        reader.setHints(decodeHints);
+
+        barcodeView.setCameraSettings(settings);
+        barcodeView.setDecoderFactory(new DefaultDecoderFactory(decodeFormats, decodeHints, characterSet));
+    }
+
+    public void setStatusText(String text) {
+        // statusView is optional when using a custom layout
+        if(statusView != null) {
+            statusView.setText(text);
+        }
+    }
+
+
+    /**
+     * @see BarcodeView#pause()
+     */
+    public void pause() {
+        barcodeView.pause();
+    }
+
+    /**
+     * @see BarcodeView#resume()
+     */
+    public void resume() {
+        barcodeView.resume();
+    }
+
+    public BarcodeView getBarcodeView() {
+        return (BarcodeView) findViewById(R.id.zxing_barcode_surface);
+    }
+
+    public ViewfinderView getViewFinder() {
+        return viewFinder;
+    }
+
+    public TextView getStatusView() {
+        return statusView;
+    }
+
+
+    /**
+     * @see BarcodeView#decodeSingle(BarcodeCallback)
+     */
+    public void decodeSingle(BarcodeCallback callback) {
+        barcodeView.decodeSingle(new WrappedCallback(callback));
+
+    }
+
+    /**
+     * @see BarcodeView#decodeContinuous(BarcodeCallback)
+     */
+    public void decodeContinuous(BarcodeCallback callback) {
+        barcodeView.decodeContinuous(new WrappedCallback(callback));
+    }
+
+    /**
+     * Turn on the device's flashlight.
+     */
+    public void setTorchOn() {
+        barcodeView.setTorch(true);
+
+        if (torchListener != null) {
+            torchListener.onTorchOn();
+        }
+    }
+
+    /**
+     * Turn off the device's flashlight.
+     */
+    public void setTorchOff() {
+        barcodeView.setTorch(false);
+
+        if (torchListener != null) {
+            torchListener.onTorchOff();
+        }
+    }
+
+    /**
+     * Handles focus, camera, volume up and volume down keys.
+     *
+     * Note that this view is not usually focused, so the Activity should call this directly.
+     */
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_FOCUS:
+            case KeyEvent.KEYCODE_CAMERA:
+                // Handle these events so they don't launch the Camera app
+                return true;
+            // Use volume up/down to turn on light
+            case KeyEvent.KEYCODE_VOLUME_DOWN:
+                setTorchOff();
+                return true;
+            case KeyEvent.KEYCODE_VOLUME_UP:
+                setTorchOn();
+                return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    public void setTorchListener(TorchListener listener) {
+        this.torchListener = listener;
+    }
+
+    /**
+     * The Listener to torch/fflashlight events (turn on, turn off).
+     */
+    public interface TorchListener {
+
+        void onTorchOn();
+
+        void onTorchOff();
+
+    }
+
+}
diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraInstance.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraInstance.java
index 1add1cd4b..7db7a784d 100644
--- a/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraInstance.java
+++ b/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraInstance.java
@@ -12,7 +12,9 @@
 import com.journeyapps.barcodescanner.Util;
 
 /**
+ * Manage a camera instance using a background thread.
  *
+ * All methods must be called from the main thread.
  */
 public class CameraInstance {
     private static final String TAG = CameraInstance.class.getSimpleName();
@@ -26,6 +28,13 @@ public class CameraInstance {
     private boolean open = false;
     private CameraSettings cameraSettings = new CameraSettings();
 
+    /**
+     * Construct a new CameraInstance.
+     *
+     * A new CameraManager is created.
+     *
+     * @param context the Android Context
+     */
     public CameraInstance(Context context) {
         Util.validateMainThread();
 
@@ -34,6 +43,17 @@ public CameraInstance(Context context) {
         this.cameraManager.setCameraSettings(cameraSettings);
     }
 
+    /**
+     * Construct a new CameraInstance with a specific CameraManager.
+     *
+     * @param cameraManager the CameraManager to use
+     */
+    public CameraInstance(CameraManager cameraManager) {
+        Util.validateMainThread();
+
+        this.cameraManager = cameraManager;
+    }
+
     public void setDisplayConfiguration(DisplayConfiguration configuration) {
         this.displayConfiguration = configuration;
         cameraManager.setDisplayConfiguration(configuration);
@@ -220,4 +240,31 @@ private void notifyError(Exception error) {
             readyHandler.obtainMessage(R.id.zxing_camera_error, error).sendToTarget();
         }
     }
+
+    /**
+     * Returns the CameraManager used to control the camera.
+     *
+     * The CameraManager is not thread-safe, and must only be used from the CameraThread.
+     *
+     * @return the CameraManager used
+     */
+    protected CameraManager getCameraManager() {
+        return cameraManager;
+    }
+
+    /**
+     *
+     * @return the CameraThread used to manage the camera
+     */
+    protected CameraThread getCameraThread() {
+        return cameraThread;
+    }
+
+    /**
+     *
+     * @return the surface om which the preview is displayed
+     */
+    protected CameraSurface getSurface() {
+        return surface;
+    }
 }
diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraManager.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraManager.java
index ccd2be8ac..2155ffcf2 100755
--- a/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraManager.java
+++ b/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraManager.java
@@ -38,6 +38,10 @@
 import java.util.List;
 
 /**
+ * Wrapper to manage the Camera. This is not thread-safe, and the methods must always be called
+ * from the same thread.
+ *
+ *
  * Call order:
  *
  * 1. setCameraSettings()
@@ -374,7 +378,10 @@ private void setParameters() {
         cameraPreviewCallback.setResolution(previewSize);
     }
 
-
+    /**
+     * This returns false if the camera is not opened yet, failed to open, or has
+     * been closed.
+     */
     public boolean isOpen() {
         return camera != null;
     }
@@ -468,4 +475,14 @@ public boolean isTorchOn() {
             return false;
         }
     }
+
+    /**
+     * Returns the Camera. This returns null if the camera is not opened yet, failed to open, or has
+     * been closed.
+     *
+     * @return the Camera
+     */
+    public Camera getCamera() {
+        return camera;
+    }
 }
diff --git a/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraSurface.java b/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraSurface.java
index 4be9d53be..af3c851d0 100644
--- a/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraSurface.java
+++ b/zxing-android-embedded/src/com/journeyapps/barcodescanner/camera/CameraSurface.java
@@ -8,7 +8,9 @@
 import java.io.IOException;
 
 /**
+ * A surface on which a camera preview is displayed.
  *
+ * This wraps either a SurfaceHolder or a SurfaceTexture.
  */
 public class CameraSurface {
     private SurfaceHolder surfaceHolder;