diff --git a/cameraview/src/main/res/layout/layout_focus_marker.xml b/cameraview/src/main/res/layout/cameraview_layout_focus_marker.xml similarity index 100% rename from cameraview/src/main/res/layout/layout_focus_marker.xml rename to cameraview/src/main/res/layout/cameraview_layout_focus_marker.xml diff --git a/cameraview/src/main/res/layout/surface_view.xml b/cameraview/src/main/res/layout/cameraview_surface_view.xml similarity index 100% rename from cameraview/src/main/res/layout/surface_view.xml rename to cameraview/src/main/res/layout/cameraview_surface_view.xml diff --git a/cameraview/src/main/res/layout/texture_view.xml b/cameraview/src/main/res/layout/cameraview_texture_view.xml similarity index 100% rename from cameraview/src/main/res/layout/texture_view.xml rename to cameraview/src/main/res/layout/cameraview_texture_view.xml diff --git a/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceCameraPreview.java b/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceCameraPreview.java index 0abc3cdd9..5a0d5ea3f 100644 --- a/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceCameraPreview.java +++ b/cameraview/src/main/views/com/otaliastudios/cameraview/SurfaceCameraPreview.java @@ -26,7 +26,7 @@ class SurfaceCameraPreview extends CameraPreview { @NonNull @Override protected View onCreateView(Context context, ViewGroup parent) { - View root = LayoutInflater.from(context).inflate(R.layout.surface_view, parent, false); + View root = LayoutInflater.from(context).inflate(R.layout.cameraview_surface_view, parent, false); parent.addView(root, 0); mSurfaceView = root.findViewById(R.id.surface_view); final SurfaceHolder holder = mSurfaceView.getHolder(); diff --git a/cameraview/src/main/views/com/otaliastudios/cameraview/TapGestureLayout.java b/cameraview/src/main/views/com/otaliastudios/cameraview/TapGestureLayout.java index bf2965cf7..2d25d0ad8 100644 --- a/cameraview/src/main/views/com/otaliastudios/cameraview/TapGestureLayout.java +++ b/cameraview/src/main/views/com/otaliastudios/cameraview/TapGestureLayout.java @@ -57,7 +57,7 @@ public void onLongPress(MotionEvent e) { // Views to draw the focus marker. - LayoutInflater.from(getContext()).inflate(R.layout.layout_focus_marker, this); + LayoutInflater.from(getContext()).inflate(R.layout.cameraview_layout_focus_marker, this); mFocusMarkerContainer = findViewById(R.id.focusMarkerContainer); mFocusMarkerFill = findViewById(R.id.fill); } diff --git a/cameraview/src/main/views/com/otaliastudios/cameraview/TextureCameraPreview.java b/cameraview/src/main/views/com/otaliastudios/cameraview/TextureCameraPreview.java index e2d34056d..60652886a 100644 --- a/cameraview/src/main/views/com/otaliastudios/cameraview/TextureCameraPreview.java +++ b/cameraview/src/main/views/com/otaliastudios/cameraview/TextureCameraPreview.java @@ -21,7 +21,7 @@ class TextureCameraPreview extends CameraPreview { @NonNull @Override protected TextureView onCreateView(Context context, ViewGroup parent) { - View root = LayoutInflater.from(context).inflate(R.layout.texture_view, parent, false); + View root = LayoutInflater.from(context).inflate(R.layout.cameraview_texture_view, parent, false); parent.addView(root, 0); TextureView texture = root.findViewById(R.id.texture_view); texture.setSurfaceTextureListener(new TextureView.SurfaceTextureListener() {