Move camera-viewfinder-* to androidx.camera.viewfinder
Moves all libraries in androidx.camera:camera-viewfinder to their own
atomic version group in androidx.camera.viewfinder
Relnote: "androidx.camera:camera-viewfinder-* libraries have been moved
to their own group: androidx.camera.viewfinder for better
organization and to call attention to their independence from the
rest of the CameraX libraries."
Test: camera-testapp-viewfinder runs; snapshot artifacts integrated
into external project
Bug: 356994283
Change-Id: If256fc7510de5f686482c090de5e6601a0075018
diff --git a/camera/camera-viewfinder-compose/api/1.3.0-beta01.txt b/camera/camera-viewfinder-compose/api/1.3.0-beta01.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-compose/api/1.3.0-beta01.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-compose/api/1.3.0-beta02.txt b/camera/camera-viewfinder-compose/api/1.3.0-beta02.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-compose/api/1.3.0-beta02.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-compose/api/1.3.0-beta03.txt b/camera/camera-viewfinder-compose/api/1.3.0-beta03.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-compose/api/1.3.0-beta03.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-compose/api/res-1.3.0-beta01.txt b/camera/camera-viewfinder-compose/api/res-1.3.0-beta01.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder-compose/api/res-1.3.0-beta01.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder-compose/api/res-1.3.0-beta02.txt b/camera/camera-viewfinder-compose/api/res-1.3.0-beta02.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder-compose/api/res-1.3.0-beta02.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder-compose/api/res-1.3.0-beta03.txt b/camera/camera-viewfinder-compose/api/res-1.3.0-beta03.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder-compose/api/res-1.3.0-beta03.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder-compose/api/restricted_1.3.0-beta01.txt b/camera/camera-viewfinder-compose/api/restricted_1.3.0-beta01.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-compose/api/restricted_1.3.0-beta01.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-compose/api/restricted_1.3.0-beta02.txt b/camera/camera-viewfinder-compose/api/restricted_1.3.0-beta02.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-compose/api/restricted_1.3.0-beta02.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-compose/api/restricted_1.3.0-beta03.txt b/camera/camera-viewfinder-compose/api/restricted_1.3.0-beta03.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-compose/api/restricted_1.3.0-beta03.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-core/api/1.3.0-beta01.txt b/camera/camera-viewfinder-core/api/1.3.0-beta01.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-core/api/1.3.0-beta01.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-core/api/1.3.0-beta02.txt b/camera/camera-viewfinder-core/api/1.3.0-beta02.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-core/api/1.3.0-beta02.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-core/api/1.3.0-beta03.txt b/camera/camera-viewfinder-core/api/1.3.0-beta03.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-core/api/1.3.0-beta03.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-core/api/res-1.3.0-beta01.txt b/camera/camera-viewfinder-core/api/res-1.3.0-beta01.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder-core/api/res-1.3.0-beta01.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder-core/api/res-1.3.0-beta02.txt b/camera/camera-viewfinder-core/api/res-1.3.0-beta02.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder-core/api/res-1.3.0-beta02.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder-core/api/res-1.3.0-beta03.txt b/camera/camera-viewfinder-core/api/res-1.3.0-beta03.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder-core/api/res-1.3.0-beta03.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder-core/api/restricted_1.3.0-beta01.txt b/camera/camera-viewfinder-core/api/restricted_1.3.0-beta01.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-core/api/restricted_1.3.0-beta01.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-core/api/restricted_1.3.0-beta02.txt b/camera/camera-viewfinder-core/api/restricted_1.3.0-beta02.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-core/api/restricted_1.3.0-beta02.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder-core/api/restricted_1.3.0-beta03.txt b/camera/camera-viewfinder-core/api/restricted_1.3.0-beta03.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/camera/camera-viewfinder-core/api/restricted_1.3.0-beta03.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/camera/camera-viewfinder/api/1.2.0-beta03.txt b/camera/camera-viewfinder/api/1.2.0-beta03.txt
deleted file mode 100644
index 04cecbd..0000000
--- a/camera/camera-viewfinder/api/1.2.0-beta03.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-// Signature format: 4.0
-
diff --git a/camera/camera-viewfinder/api/1.3.0-beta01.txt b/camera/camera-viewfinder/api/1.3.0-beta01.txt
deleted file mode 100644
index a7333d7..0000000
--- a/camera/camera-viewfinder/api/1.3.0-beta01.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Signature format: 4.0
-package androidx.camera.viewfinder {
-
- @RequiresApi(21) public final class CameraViewfinder extends android.widget.FrameLayout {
- ctor @UiThread public CameraViewfinder(android.content.Context);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int, int);
- method @UiThread public android.graphics.Bitmap? getBitmap();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode getImplementationMode();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ScaleType getScaleType();
- method @UiThread public com.google.common.util.concurrent.ListenableFuture<android.view.Surface!> requestSurfaceAsync(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- method @UiThread public void setScaleType(androidx.camera.viewfinder.CameraViewfinder.ScaleType);
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ImplementationMode {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode COMPATIBLE;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode PERFORMANCE;
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ScaleType {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_START;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_START;
- }
-
- @RequiresApi(21) public final class CameraViewfinderExt {
- method public suspend Object? requestSurface(androidx.camera.viewfinder.CameraViewfinder, androidx.camera.viewfinder.ViewfinderSurfaceRequest viewfinderSurfaceRequest, kotlin.coroutines.Continuation<? super android.view.Surface>);
- field public static final androidx.camera.viewfinder.CameraViewfinderExt INSTANCE;
- }
-
- @RequiresApi(21) public class ViewfinderSurfaceRequest {
- method public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode? getImplementationMode();
- method public int getLensFacing();
- method public android.util.Size getResolution();
- method public int getSensorOrientation();
- method public void markSurfaceSafeToRelease();
- }
-
- public static final class ViewfinderSurfaceRequest.Builder {
- ctor public ViewfinderSurfaceRequest.Builder(android.util.Size);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest build();
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setImplementationMode(androidx.camera.viewfinder.CameraViewfinder.ImplementationMode?);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setLensFacing(int);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setSensorOrientation(int);
- }
-
- public final class ViewfinderSurfaceRequestUtil {
- method @RequiresApi(21) public static androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder populateFromCharacteristics(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder, android.hardware.camera2.CameraCharacteristics cameraCharacteristics);
- }
-
-}
-
diff --git a/camera/camera-viewfinder/api/1.3.0-beta02.txt b/camera/camera-viewfinder/api/1.3.0-beta02.txt
deleted file mode 100644
index a7333d7..0000000
--- a/camera/camera-viewfinder/api/1.3.0-beta02.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Signature format: 4.0
-package androidx.camera.viewfinder {
-
- @RequiresApi(21) public final class CameraViewfinder extends android.widget.FrameLayout {
- ctor @UiThread public CameraViewfinder(android.content.Context);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int, int);
- method @UiThread public android.graphics.Bitmap? getBitmap();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode getImplementationMode();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ScaleType getScaleType();
- method @UiThread public com.google.common.util.concurrent.ListenableFuture<android.view.Surface!> requestSurfaceAsync(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- method @UiThread public void setScaleType(androidx.camera.viewfinder.CameraViewfinder.ScaleType);
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ImplementationMode {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode COMPATIBLE;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode PERFORMANCE;
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ScaleType {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_START;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_START;
- }
-
- @RequiresApi(21) public final class CameraViewfinderExt {
- method public suspend Object? requestSurface(androidx.camera.viewfinder.CameraViewfinder, androidx.camera.viewfinder.ViewfinderSurfaceRequest viewfinderSurfaceRequest, kotlin.coroutines.Continuation<? super android.view.Surface>);
- field public static final androidx.camera.viewfinder.CameraViewfinderExt INSTANCE;
- }
-
- @RequiresApi(21) public class ViewfinderSurfaceRequest {
- method public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode? getImplementationMode();
- method public int getLensFacing();
- method public android.util.Size getResolution();
- method public int getSensorOrientation();
- method public void markSurfaceSafeToRelease();
- }
-
- public static final class ViewfinderSurfaceRequest.Builder {
- ctor public ViewfinderSurfaceRequest.Builder(android.util.Size);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest build();
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setImplementationMode(androidx.camera.viewfinder.CameraViewfinder.ImplementationMode?);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setLensFacing(int);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setSensorOrientation(int);
- }
-
- public final class ViewfinderSurfaceRequestUtil {
- method @RequiresApi(21) public static androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder populateFromCharacteristics(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder, android.hardware.camera2.CameraCharacteristics cameraCharacteristics);
- }
-
-}
-
diff --git a/camera/camera-viewfinder/api/1.3.0-beta03.txt b/camera/camera-viewfinder/api/1.3.0-beta03.txt
deleted file mode 100644
index a7333d7..0000000
--- a/camera/camera-viewfinder/api/1.3.0-beta03.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Signature format: 4.0
-package androidx.camera.viewfinder {
-
- @RequiresApi(21) public final class CameraViewfinder extends android.widget.FrameLayout {
- ctor @UiThread public CameraViewfinder(android.content.Context);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int, int);
- method @UiThread public android.graphics.Bitmap? getBitmap();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode getImplementationMode();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ScaleType getScaleType();
- method @UiThread public com.google.common.util.concurrent.ListenableFuture<android.view.Surface!> requestSurfaceAsync(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- method @UiThread public void setScaleType(androidx.camera.viewfinder.CameraViewfinder.ScaleType);
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ImplementationMode {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode COMPATIBLE;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode PERFORMANCE;
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ScaleType {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_START;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_START;
- }
-
- @RequiresApi(21) public final class CameraViewfinderExt {
- method public suspend Object? requestSurface(androidx.camera.viewfinder.CameraViewfinder, androidx.camera.viewfinder.ViewfinderSurfaceRequest viewfinderSurfaceRequest, kotlin.coroutines.Continuation<? super android.view.Surface>);
- field public static final androidx.camera.viewfinder.CameraViewfinderExt INSTANCE;
- }
-
- @RequiresApi(21) public class ViewfinderSurfaceRequest {
- method public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode? getImplementationMode();
- method public int getLensFacing();
- method public android.util.Size getResolution();
- method public int getSensorOrientation();
- method public void markSurfaceSafeToRelease();
- }
-
- public static final class ViewfinderSurfaceRequest.Builder {
- ctor public ViewfinderSurfaceRequest.Builder(android.util.Size);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest build();
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setImplementationMode(androidx.camera.viewfinder.CameraViewfinder.ImplementationMode?);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setLensFacing(int);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setSensorOrientation(int);
- }
-
- public final class ViewfinderSurfaceRequestUtil {
- method @RequiresApi(21) public static androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder populateFromCharacteristics(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder, android.hardware.camera2.CameraCharacteristics cameraCharacteristics);
- }
-
-}
-
diff --git a/camera/camera-viewfinder/api/res-1.2.0-beta03.txt b/camera/camera-viewfinder/api/res-1.2.0-beta03.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder/api/res-1.2.0-beta03.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder/api/res-1.3.0-beta01.txt b/camera/camera-viewfinder/api/res-1.3.0-beta01.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder/api/res-1.3.0-beta01.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder/api/res-1.3.0-beta02.txt b/camera/camera-viewfinder/api/res-1.3.0-beta02.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder/api/res-1.3.0-beta02.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder/api/res-1.3.0-beta03.txt b/camera/camera-viewfinder/api/res-1.3.0-beta03.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder/api/res-1.3.0-beta03.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder/api/res-current.txt b/camera/camera-viewfinder/api/res-current.txt
deleted file mode 100644
index e69de29..0000000
--- a/camera/camera-viewfinder/api/res-current.txt
+++ /dev/null
diff --git a/camera/camera-viewfinder/api/restricted_1.2.0-beta03.txt b/camera/camera-viewfinder/api/restricted_1.2.0-beta03.txt
deleted file mode 100644
index 04cecbd..0000000
--- a/camera/camera-viewfinder/api/restricted_1.2.0-beta03.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-// Signature format: 4.0
-
diff --git a/camera/camera-viewfinder/api/restricted_1.3.0-beta01.txt b/camera/camera-viewfinder/api/restricted_1.3.0-beta01.txt
deleted file mode 100644
index a7333d7..0000000
--- a/camera/camera-viewfinder/api/restricted_1.3.0-beta01.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Signature format: 4.0
-package androidx.camera.viewfinder {
-
- @RequiresApi(21) public final class CameraViewfinder extends android.widget.FrameLayout {
- ctor @UiThread public CameraViewfinder(android.content.Context);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int, int);
- method @UiThread public android.graphics.Bitmap? getBitmap();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode getImplementationMode();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ScaleType getScaleType();
- method @UiThread public com.google.common.util.concurrent.ListenableFuture<android.view.Surface!> requestSurfaceAsync(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- method @UiThread public void setScaleType(androidx.camera.viewfinder.CameraViewfinder.ScaleType);
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ImplementationMode {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode COMPATIBLE;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode PERFORMANCE;
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ScaleType {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_START;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_START;
- }
-
- @RequiresApi(21) public final class CameraViewfinderExt {
- method public suspend Object? requestSurface(androidx.camera.viewfinder.CameraViewfinder, androidx.camera.viewfinder.ViewfinderSurfaceRequest viewfinderSurfaceRequest, kotlin.coroutines.Continuation<? super android.view.Surface>);
- field public static final androidx.camera.viewfinder.CameraViewfinderExt INSTANCE;
- }
-
- @RequiresApi(21) public class ViewfinderSurfaceRequest {
- method public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode? getImplementationMode();
- method public int getLensFacing();
- method public android.util.Size getResolution();
- method public int getSensorOrientation();
- method public void markSurfaceSafeToRelease();
- }
-
- public static final class ViewfinderSurfaceRequest.Builder {
- ctor public ViewfinderSurfaceRequest.Builder(android.util.Size);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest build();
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setImplementationMode(androidx.camera.viewfinder.CameraViewfinder.ImplementationMode?);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setLensFacing(int);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setSensorOrientation(int);
- }
-
- public final class ViewfinderSurfaceRequestUtil {
- method @RequiresApi(21) public static androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder populateFromCharacteristics(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder, android.hardware.camera2.CameraCharacteristics cameraCharacteristics);
- }
-
-}
-
diff --git a/camera/camera-viewfinder/api/restricted_1.3.0-beta02.txt b/camera/camera-viewfinder/api/restricted_1.3.0-beta02.txt
deleted file mode 100644
index a7333d7..0000000
--- a/camera/camera-viewfinder/api/restricted_1.3.0-beta02.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Signature format: 4.0
-package androidx.camera.viewfinder {
-
- @RequiresApi(21) public final class CameraViewfinder extends android.widget.FrameLayout {
- ctor @UiThread public CameraViewfinder(android.content.Context);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int, int);
- method @UiThread public android.graphics.Bitmap? getBitmap();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode getImplementationMode();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ScaleType getScaleType();
- method @UiThread public com.google.common.util.concurrent.ListenableFuture<android.view.Surface!> requestSurfaceAsync(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- method @UiThread public void setScaleType(androidx.camera.viewfinder.CameraViewfinder.ScaleType);
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ImplementationMode {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode COMPATIBLE;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode PERFORMANCE;
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ScaleType {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_START;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_START;
- }
-
- @RequiresApi(21) public final class CameraViewfinderExt {
- method public suspend Object? requestSurface(androidx.camera.viewfinder.CameraViewfinder, androidx.camera.viewfinder.ViewfinderSurfaceRequest viewfinderSurfaceRequest, kotlin.coroutines.Continuation<? super android.view.Surface>);
- field public static final androidx.camera.viewfinder.CameraViewfinderExt INSTANCE;
- }
-
- @RequiresApi(21) public class ViewfinderSurfaceRequest {
- method public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode? getImplementationMode();
- method public int getLensFacing();
- method public android.util.Size getResolution();
- method public int getSensorOrientation();
- method public void markSurfaceSafeToRelease();
- }
-
- public static final class ViewfinderSurfaceRequest.Builder {
- ctor public ViewfinderSurfaceRequest.Builder(android.util.Size);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest build();
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setImplementationMode(androidx.camera.viewfinder.CameraViewfinder.ImplementationMode?);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setLensFacing(int);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setSensorOrientation(int);
- }
-
- public final class ViewfinderSurfaceRequestUtil {
- method @RequiresApi(21) public static androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder populateFromCharacteristics(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder, android.hardware.camera2.CameraCharacteristics cameraCharacteristics);
- }
-
-}
-
diff --git a/camera/camera-viewfinder/api/restricted_1.3.0-beta03.txt b/camera/camera-viewfinder/api/restricted_1.3.0-beta03.txt
deleted file mode 100644
index a7333d7..0000000
--- a/camera/camera-viewfinder/api/restricted_1.3.0-beta03.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Signature format: 4.0
-package androidx.camera.viewfinder {
-
- @RequiresApi(21) public final class CameraViewfinder extends android.widget.FrameLayout {
- ctor @UiThread public CameraViewfinder(android.content.Context);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int);
- ctor @UiThread public CameraViewfinder(android.content.Context, android.util.AttributeSet?, int, int);
- method @UiThread public android.graphics.Bitmap? getBitmap();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode getImplementationMode();
- method @UiThread public androidx.camera.viewfinder.CameraViewfinder.ScaleType getScaleType();
- method @UiThread public com.google.common.util.concurrent.ListenableFuture<android.view.Surface!> requestSurfaceAsync(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- method @UiThread public void setScaleType(androidx.camera.viewfinder.CameraViewfinder.ScaleType);
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ImplementationMode {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode COMPATIBLE;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ImplementationMode PERFORMANCE;
- }
-
- @RequiresApi(21) public enum CameraViewfinder.ScaleType {
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FILL_START;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_CENTER;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_END;
- enum_constant public static final androidx.camera.viewfinder.CameraViewfinder.ScaleType FIT_START;
- }
-
- @RequiresApi(21) public final class CameraViewfinderExt {
- method public suspend Object? requestSurface(androidx.camera.viewfinder.CameraViewfinder, androidx.camera.viewfinder.ViewfinderSurfaceRequest viewfinderSurfaceRequest, kotlin.coroutines.Continuation<? super android.view.Surface>);
- field public static final androidx.camera.viewfinder.CameraViewfinderExt INSTANCE;
- }
-
- @RequiresApi(21) public class ViewfinderSurfaceRequest {
- method public androidx.camera.viewfinder.CameraViewfinder.ImplementationMode? getImplementationMode();
- method public int getLensFacing();
- method public android.util.Size getResolution();
- method public int getSensorOrientation();
- method public void markSurfaceSafeToRelease();
- }
-
- public static final class ViewfinderSurfaceRequest.Builder {
- ctor public ViewfinderSurfaceRequest.Builder(android.util.Size);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest);
- ctor public ViewfinderSurfaceRequest.Builder(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest build();
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setImplementationMode(androidx.camera.viewfinder.CameraViewfinder.ImplementationMode?);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setLensFacing(int);
- method public androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder setSensorOrientation(int);
- }
-
- public final class ViewfinderSurfaceRequestUtil {
- method @RequiresApi(21) public static androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder populateFromCharacteristics(androidx.camera.viewfinder.ViewfinderSurfaceRequest.Builder, android.hardware.camera2.CameraCharacteristics cameraCharacteristics);
- }
-
-}
-
diff --git a/camera/integration-tests/viewfindertestapp/build.gradle b/camera/integration-tests/viewfindertestapp/build.gradle
index 49508b5..5a84892 100644
--- a/camera/integration-tests/viewfindertestapp/build.gradle
+++ b/camera/integration-tests/viewfindertestapp/build.gradle
@@ -37,7 +37,7 @@
dependencies {
// Internal library
- implementation(project(":camera:camera-viewfinder"))
+ implementation(project(":camera:viewfinder:viewfinder-view"))
// Android Support Library
implementation("androidx.appcompat:appcompat:1.7.0")
diff --git a/camera/camera-viewfinder-compose/api/current.txt b/camera/viewfinder/viewfinder-compose/api/current.txt
similarity index 100%
rename from camera/camera-viewfinder-compose/api/current.txt
rename to camera/viewfinder/viewfinder-compose/api/current.txt
diff --git a/camera/camera-viewfinder-compose/api/res-current.txt b/camera/viewfinder/viewfinder-compose/api/res-current.txt
similarity index 100%
rename from camera/camera-viewfinder-compose/api/res-current.txt
rename to camera/viewfinder/viewfinder-compose/api/res-current.txt
diff --git a/camera/camera-viewfinder-compose/api/restricted_current.txt b/camera/viewfinder/viewfinder-compose/api/restricted_current.txt
similarity index 100%
rename from camera/camera-viewfinder-compose/api/restricted_current.txt
rename to camera/viewfinder/viewfinder-compose/api/restricted_current.txt
diff --git a/camera/camera-viewfinder-compose/build.gradle b/camera/viewfinder/viewfinder-compose/build.gradle
similarity index 88%
rename from camera/camera-viewfinder-compose/build.gradle
rename to camera/viewfinder/viewfinder-compose/build.gradle
index 1ce6918..e832210 100644
--- a/camera/camera-viewfinder-compose/build.gradle
+++ b/camera/viewfinder/viewfinder-compose/build.gradle
@@ -31,7 +31,7 @@
}
dependencies {
- api(project(':camera:camera-viewfinder-core'))
+ api(project(":camera:viewfinder:viewfinder-core"))
implementation("androidx.compose.foundation:foundation-layout:1.6.1")
implementation("androidx.compose.foundation:foundation:1.6.1")
implementation("androidx.compose.runtime:runtime:1.6.1")
@@ -53,14 +53,13 @@
namespace "androidx.camera.viewfinder.compose"
sourceSets.androidTest.assets.srcDirs +=
- project.rootDir.absolutePath + "/../../golden/camera/camera-viewfinder-compose"
+ project.rootDir.absolutePath + "/../../golden/camera/viewfinder/viewfinder-compose"
}
androidx {
- name = "androidx.camera:camera-viewfinder-compose"
+ name = "Camera Viewfinder Compose"
type = LibraryType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
inceptionYear = "2023"
- mavenVersion = LibraryVersions.CAMERA_VIEWFINDER_COMPOSE
- description = "Composable ViewFinder implementation for CameraX"
+ description = "Standalone Composable Viewfinder for Camera"
legacyDisableKotlinStrictApiMode = true
}
diff --git a/camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/CoordinateTransformerTest.kt b/camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/CoordinateTransformerTest.kt
similarity index 100%
rename from camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/CoordinateTransformerTest.kt
rename to camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/CoordinateTransformerTest.kt
diff --git a/camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/GoldenCommon.kt b/camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/GoldenCommon.kt
similarity index 88%
rename from camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/GoldenCommon.kt
rename to camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/GoldenCommon.kt
index ea903cf..d182d04 100644
--- a/camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/GoldenCommon.kt
+++ b/camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/GoldenCommon.kt
@@ -16,4 +16,4 @@
package androidx.camera.viewfinder.compose
-const val GOLDEN_CAMERA_VIEWFINDER_COMPOSE = "camera/camera-viewfinder-compose"
+const val GOLDEN_CAMERA_VIEWFINDER_COMPOSE = "camera/viewfinder/viewfinder-compose"
diff --git a/camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderScreenshotTest.kt b/camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderScreenshotTest.kt
similarity index 100%
rename from camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderScreenshotTest.kt
rename to camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderScreenshotTest.kt
diff --git a/camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderTest.kt b/camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderTest.kt
similarity index 100%
rename from camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderTest.kt
rename to camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderTest.kt
diff --git a/camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderTestParams.kt b/camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderTestParams.kt
similarity index 100%
rename from camera/camera-viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderTestParams.kt
rename to camera/viewfinder/viewfinder-compose/src/androidTest/kotlin/androidx/camera/viewfinder/compose/ViewfinderTestParams.kt
diff --git a/camera/camera-viewfinder-compose/src/main/java/androidx/camera/androidx-camera-camera-viewfinder-compose-documentation.md b/camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/androidx-camera-viewfinder-viewfinder-compose-documentation.md
similarity index 100%
rename from camera/camera-viewfinder-compose/src/main/java/androidx/camera/androidx-camera-camera-viewfinder-compose-documentation.md
rename to camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/androidx-camera-viewfinder-viewfinder-compose-documentation.md
diff --git a/camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/CoordinateTransformer.kt b/camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/CoordinateTransformer.kt
similarity index 100%
rename from camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/CoordinateTransformer.kt
rename to camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/CoordinateTransformer.kt
diff --git a/camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/Viewfinder.kt b/camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/Viewfinder.kt
similarity index 100%
rename from camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/Viewfinder.kt
rename to camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/Viewfinder.kt
diff --git a/camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/RefCounted.kt b/camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/RefCounted.kt
similarity index 100%
rename from camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/RefCounted.kt
rename to camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/RefCounted.kt
diff --git a/camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/SurfaceTransformationUtil.kt b/camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/SurfaceTransformationUtil.kt
similarity index 100%
rename from camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/SurfaceTransformationUtil.kt
rename to camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/SurfaceTransformationUtil.kt
diff --git a/camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/TransformUtil.kt b/camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/TransformUtil.kt
similarity index 100%
rename from camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/TransformUtil.kt
rename to camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/TransformUtil.kt
diff --git a/camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/package-info.java b/camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/package-info.java
similarity index 100%
rename from camera/camera-viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/package-info.java
rename to camera/viewfinder/viewfinder-compose/src/main/java/androidx/camera/viewfinder/compose/internal/package-info.java
diff --git a/camera/camera-viewfinder-core/api/current.txt b/camera/viewfinder/viewfinder-core/api/current.txt
similarity index 100%
rename from camera/camera-viewfinder-core/api/current.txt
rename to camera/viewfinder/viewfinder-core/api/current.txt
diff --git a/camera/camera-viewfinder-core/api/res-current.txt b/camera/viewfinder/viewfinder-core/api/res-current.txt
similarity index 100%
rename from camera/camera-viewfinder-core/api/res-current.txt
rename to camera/viewfinder/viewfinder-core/api/res-current.txt
diff --git a/camera/camera-viewfinder-core/api/restricted_current.txt b/camera/viewfinder/viewfinder-core/api/restricted_current.txt
similarity index 100%
rename from camera/camera-viewfinder-core/api/restricted_current.txt
rename to camera/viewfinder/viewfinder-core/api/restricted_current.txt
diff --git a/camera/camera-viewfinder-core/build.gradle b/camera/viewfinder/viewfinder-core/build.gradle
similarity index 91%
rename from camera/camera-viewfinder-core/build.gradle
rename to camera/viewfinder/viewfinder-core/build.gradle
index 2fdbc6c..be99e70 100644
--- a/camera/camera-viewfinder-core/build.gradle
+++ b/camera/viewfinder/viewfinder-core/build.gradle
@@ -50,10 +50,10 @@
}
androidx {
- name = "Camera ViewFinder Core"
+ name = "Camera Viewfinder Core"
type = LibraryType.PUBLISHED_LIBRARY
inceptionYear = "2023"
- description = "Core dependencies for ViewFinder"
+ description = "Core dependencies for Viewfinder"
legacyDisableKotlinStrictApiMode = true
- samples(project(":camera:camera-viewfinder-core:camera-viewfinder-core-samples"))
+ samples(project(":camera:viewfinder:viewfinder-core:viewfinder-core-samples"))
}
diff --git a/camera/camera-viewfinder-core/samples/build.gradle b/camera/viewfinder/viewfinder-core/samples/build.gradle
similarity index 92%
rename from camera/camera-viewfinder-core/samples/build.gradle
rename to camera/viewfinder/viewfinder-core/samples/build.gradle
index 8666bda..3a3e589 100644
--- a/camera/camera-viewfinder-core/samples/build.gradle
+++ b/camera/viewfinder/viewfinder-core/samples/build.gradle
@@ -33,7 +33,7 @@
api("androidx.annotation:annotation:1.8.1")
implementation(libs.kotlinStdlib)
implementation(project(":camera:camera-core"))
- implementation(project(":camera:camera-viewfinder-core"))
+ implementation(project(":camera:viewfinder:viewfinder-core"))
compileOnly(project(":annotation:annotation-sampled"))
}
@@ -42,7 +42,7 @@
}
androidx {
- name = "Camera ViewFinder Core Samples"
+ name = "Camera Viewfinder Core Samples"
type = LibraryType.SAMPLES
inceptionYear = "2023"
description = "Contains sample code for the Androidx Camera ViewFinder Core APIs and Utilities"
diff --git a/camera/camera-viewfinder-core/samples/src/main/java/androidx/camera/viewfinder/core/samples/ZoomGestureDetectorSamples.kt b/camera/viewfinder/viewfinder-core/samples/src/main/java/androidx/camera/viewfinder/core/samples/ZoomGestureDetectorSamples.kt
similarity index 100%
rename from camera/camera-viewfinder-core/samples/src/main/java/androidx/camera/viewfinder/core/samples/ZoomGestureDetectorSamples.kt
rename to camera/viewfinder/viewfinder-core/samples/src/main/java/androidx/camera/viewfinder/core/samples/ZoomGestureDetectorSamples.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/package-info.java b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/package-info.java
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/package-info.java
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/package-info.java
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/Logger.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/Logger.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/Logger.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/Logger.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/DirectExecutor.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/DirectExecutor.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/DirectExecutor.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/DirectExecutor.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/HandlerScheduledExecutorService.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/HandlerScheduledExecutorService.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/HandlerScheduledExecutorService.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/HandlerScheduledExecutorService.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/MainThreadExecutor.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/MainThreadExecutor.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/MainThreadExecutor.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/MainThreadExecutor.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/ViewfinderExecutors.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/ViewfinderExecutors.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/ViewfinderExecutors.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/executor/ViewfinderExecutors.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/AsyncFunction.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/AsyncFunction.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/AsyncFunction.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/AsyncFunction.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ChainingListenableFuture.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ChainingListenableFuture.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ChainingListenableFuture.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ChainingListenableFuture.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/FutureCallback.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/FutureCallback.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/FutureCallback.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/FutureCallback.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/FutureChain.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/FutureChain.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/FutureChain.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/FutureChain.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/Futures.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/Futures.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/Futures.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/Futures.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ImmediateFuture.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ImmediateFuture.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ImmediateFuture.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ImmediateFuture.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ListFuture.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ListFuture.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ListFuture.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/impl/utils/futures/ListFuture.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/androidx-camera-camera-viewfinder-core-documentation.md b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/androidx-camera-viewfinder-viewfinder-core-documentation.md
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/androidx-camera-camera-viewfinder-core-documentation.md
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/androidx-camera-viewfinder-viewfinder-core-documentation.md
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/core/ZoomGestureDetector.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/core/ZoomGestureDetector.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/core/ZoomGestureDetector.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/core/ZoomGestureDetector.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/impl/package-info.java b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/impl/package-info.java
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/impl/package-info.java
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/impl/package-info.java
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/impl/surface/DeferredSurface.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/impl/surface/DeferredSurface.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/impl/surface/DeferredSurface.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/impl/surface/DeferredSurface.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ImplementationMode.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ImplementationMode.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ImplementationMode.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ImplementationMode.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/TransformationInfo.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/TransformationInfo.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/TransformationInfo.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/TransformationInfo.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceProvider.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceProvider.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceProvider.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceProvider.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceRequest.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceRequest.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceRequest.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceRequest.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceRequestExt.kt b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceRequestExt.kt
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceRequestExt.kt
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/ViewfinderSurfaceRequestExt.kt
diff --git a/camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/package-info.java b/camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/package-info.java
similarity index 100%
rename from camera/camera-viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/package-info.java
rename to camera/viewfinder/viewfinder-core/src/main/java/androidx/camera/viewfinder/surface/package-info.java
diff --git a/camera/camera-viewfinder/api/current.txt b/camera/viewfinder/viewfinder-view/api/current.txt
similarity index 100%
rename from camera/camera-viewfinder/api/current.txt
rename to camera/viewfinder/viewfinder-view/api/current.txt
diff --git a/camera/camera-viewfinder-compose/api/res-current.txt b/camera/viewfinder/viewfinder-view/api/res-current.txt
similarity index 100%
copy from camera/camera-viewfinder-compose/api/res-current.txt
copy to camera/viewfinder/viewfinder-view/api/res-current.txt
diff --git a/camera/camera-viewfinder/api/restricted_current.txt b/camera/viewfinder/viewfinder-view/api/restricted_current.txt
similarity index 100%
rename from camera/camera-viewfinder/api/restricted_current.txt
rename to camera/viewfinder/viewfinder-view/api/restricted_current.txt
diff --git a/camera/camera-viewfinder/build.gradle b/camera/viewfinder/viewfinder-view/build.gradle
similarity index 94%
rename from camera/camera-viewfinder/build.gradle
rename to camera/viewfinder/viewfinder-view/build.gradle
index f8a1f30..4225bde 100644
--- a/camera/camera-viewfinder/build.gradle
+++ b/camera/viewfinder/viewfinder-view/build.gradle
@@ -31,7 +31,7 @@
dependencies {
api("androidx.annotation:annotation:1.8.1")
- api(project(':camera:camera-viewfinder-core'))
+ api(project(":camera:viewfinder:viewfinder-core"))
implementation("androidx.annotation:annotation-experimental:1.4.1")
implementation(libs.guavaListenableFuture)
implementation("androidx.core:core:1.7.0")
@@ -79,9 +79,9 @@
}
androidx {
- name = "Camera ViewFinder"
+ name = "Camera Viewfinder View"
type = LibraryType.PUBLISHED_LIBRARY
inceptionYear = "2022"
- description = "Standalone Viewfinder for Camera2 and CameraX"
+ description = "Standalone View-based Viewfinder for Camera"
legacyDisableKotlinStrictApiMode = true
}
diff --git a/camera/camera-viewfinder/lint-baseline.xml b/camera/viewfinder/viewfinder-view/lint-baseline.xml
similarity index 100%
rename from camera/camera-viewfinder/lint-baseline.xml
rename to camera/viewfinder/viewfinder-view/lint-baseline.xml
diff --git a/camera/camera-viewfinder/src/androidTest/AndroidManifest.xml b/camera/viewfinder/viewfinder-view/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from camera/camera-viewfinder/src/androidTest/AndroidManifest.xml
rename to camera/viewfinder/viewfinder-view/src/androidTest/AndroidManifest.xml
diff --git a/camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/CameraViewfinderBitmapTest.kt b/camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/CameraViewfinderBitmapTest.kt
similarity index 100%
rename from camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/CameraViewfinderBitmapTest.kt
rename to camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/CameraViewfinderBitmapTest.kt
diff --git a/camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/SurfaceViewImplementationTest.kt b/camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/SurfaceViewImplementationTest.kt
similarity index 100%
rename from camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/SurfaceViewImplementationTest.kt
rename to camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/SurfaceViewImplementationTest.kt
diff --git a/camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/TextureViewImplementationTest.kt b/camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/TextureViewImplementationTest.kt
similarity index 100%
rename from camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/TextureViewImplementationTest.kt
rename to camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/TextureViewImplementationTest.kt
diff --git a/camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/utils/CoreAppTestUtil.java b/camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/utils/CoreAppTestUtil.java
similarity index 100%
rename from camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/utils/CoreAppTestUtil.java
rename to camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/utils/CoreAppTestUtil.java
diff --git a/camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/utils/FakeActivity.java b/camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/utils/FakeActivity.java
similarity index 100%
rename from camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/utils/FakeActivity.java
rename to camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/utils/FakeActivity.java
diff --git a/camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/utils/ForegroundTestActivity.java b/camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/utils/ForegroundTestActivity.java
similarity index 100%
rename from camera/camera-viewfinder/src/androidTest/java/androidx/camera/viewfinder/utils/ForegroundTestActivity.java
rename to camera/viewfinder/viewfinder-view/src/androidTest/java/androidx/camera/viewfinder/utils/ForegroundTestActivity.java
diff --git a/camera/camera-viewfinder/src/main/AndroidManifest.xml b/camera/viewfinder/viewfinder-view/src/main/AndroidManifest.xml
similarity index 100%
rename from camera/camera-viewfinder/src/main/AndroidManifest.xml
rename to camera/viewfinder/viewfinder-view/src/main/AndroidManifest.xml
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/CameraViewfinder.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/CameraViewfinder.java
similarity index 97%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/CameraViewfinder.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/CameraViewfinder.java
index b54a2f6..dc5dafb 100644
--- a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/CameraViewfinder.java
+++ b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/CameraViewfinder.java
@@ -200,18 +200,18 @@
/**
* Returns the {@link ImplementationMode}.
*
- * <p> For each {@link ViewfinderSurfaceRequest} sent to {@link CameraViewfinder}, the
+ * <p>For each {@link ViewfinderSurfaceRequest} sent to {@link CameraViewfinder}, the
* {@link ImplementationMode} set in the {@link ViewfinderSurfaceRequest} will be used first.
* If it's not set, the {@code app:implementationMode} in the layout xml will be used. If
* it's not set in the layout xml, the default value {@link ImplementationMode#PERFORMANCE}
- * will be used. Each {@link ViewfinderSurfaceRequest sent to {@link CameraViewfinder} can
- * override the {@link ImplementationMode} once it has set the
- * {@link ImplementationMode}.
+ * will be used. Each {@link ViewfinderSurfaceRequest} sent to {@link CameraViewfinder} can
+ * override the {@link ImplementationMode} once it has set the {@link ImplementationMode}.
*
- * @return The {@link ImplementationMode} for {@link CameraViewfinder}.
- * @deprecated Use {@link #getSurfaceImplementationMode()} instead.
- * The {@link ImplementationMode} in camera-viewfinder will be made obsolete with the
- * introduction of camera-viewfinder-core.
+ * @return The {@link ImplementationMode} for the viewfinder.
+ *
+ * @deprecated Use {@link #getSurfaceImplementationMode()} instead. The
+ * {@link ImplementationMode} in viewfinder-view will be made obsolete with the
+ * introduction of viewfinder-core.
*/
@Deprecated
@UiThread
@@ -320,8 +320,8 @@
* @see ViewfinderSurfaceRequest
* @deprecated Use
* {@link #requestSurfaceAsync(androidx.camera.viewfinder.surface.ViewfinderSurfaceRequest)}
- * instead. The {@link ViewfinderSurfaceRequest} in camera-viewfinder will be made obsolete
- * with the introduction of camera-viewfinder-core.
+ * instead. The {@link ViewfinderSurfaceRequest} in viewfinder-view will be made obsolete
+ * with the introduction of viewfinder-core.
*/
@Deprecated
@UiThread
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/CameraViewfinderExt.kt b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/CameraViewfinderExt.kt
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/CameraViewfinderExt.kt
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/CameraViewfinderExt.kt
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/SurfaceViewImplementation.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/SurfaceViewImplementation.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/SurfaceViewImplementation.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/SurfaceViewImplementation.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/TextureViewImplementation.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/TextureViewImplementation.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/TextureViewImplementation.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/TextureViewImplementation.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/ViewfinderImplementation.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/ViewfinderImplementation.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/ViewfinderImplementation.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/ViewfinderImplementation.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/ViewfinderSurfaceRequest.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/ViewfinderSurfaceRequest.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/ViewfinderSurfaceRequest.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/ViewfinderSurfaceRequest.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/ViewfinderSurfaceRequestExt.kt b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/ViewfinderSurfaceRequestExt.kt
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/ViewfinderSurfaceRequestExt.kt
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/ViewfinderSurfaceRequestExt.kt
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/ViewfinderTransformation.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/ViewfinderTransformation.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/ViewfinderTransformation.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/ViewfinderTransformation.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/package-info.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/package-info.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/package-info.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/package-info.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirks.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirks.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirks.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirks.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirksLoader.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirksLoader.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirksLoader.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirksLoader.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/Quirk.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/Quirk.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/Quirk.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/Quirk.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/Quirks.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/Quirks.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/Quirks.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/Quirks.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewNotCroppedByParentQuirk.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewNotCroppedByParentQuirk.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewNotCroppedByParentQuirk.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewNotCroppedByParentQuirk.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirk.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirk.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirk.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirk.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/package-info.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/package-info.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/quirk/package-info.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/quirk/package-info.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/transform/Rotation.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/transform/Rotation.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/transform/Rotation.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/transform/Rotation.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/transform/TransformationInfo.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/transform/TransformationInfo.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/transform/TransformationInfo.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/transform/TransformationInfo.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/transform/package-info.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/transform/package-info.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/transform/package-info.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/transform/package-info.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/CameraOrientationUtil.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/CameraOrientationUtil.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/CameraOrientationUtil.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/CameraOrientationUtil.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/CameraThreads.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/CameraThreads.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/CameraThreads.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/CameraThreads.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/Logger.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/Logger.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/Logger.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/Logger.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/Threads.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/Threads.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/Threads.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/Threads.java
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/TransformUtils.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/TransformUtils.java
similarity index 97%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/TransformUtils.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/TransformUtils.java
index 28ee6d5..5eea248 100644
--- a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/TransformUtils.java
+++ b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/TransformUtils.java
@@ -35,7 +35,7 @@
* {@link RectF}, a rotation degrees integer and a boolean flag for the rotation-direction
* (clockwise v.s. counter-clockwise).
*
- * TODO(b/179827713): merge this with {@link androidx.camera.core.internal.utils.ImageUtil}.
+ * TODO(b/179827713): merge this with androidx.camera.core.internal.utils.ImageUtil.
*/
public class TransformUtils {
@@ -133,7 +133,7 @@
* Gets the transform from one {@link Rect} to another with rotation degrees.
*
* <p> Following is how the source is mapped to the target with a 90° rotation. The rect
- * <a, b, c, d> is mapped to <a', b', c', d'>.
+ * <a, b, c, d> is mapped to <a', b', c', d'>.
*
* <pre>
* a----------b d'-----------a'
diff --git a/camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/package-info.java b/camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/package-info.java
similarity index 100%
rename from camera/camera-viewfinder/src/main/java/androidx/camera/viewfinder/internal/utils/package-info.java
rename to camera/viewfinder/viewfinder-view/src/main/java/androidx/camera/viewfinder/internal/utils/package-info.java
diff --git a/camera/camera-viewfinder/src/main/res-public/values/public_attrs.xml b/camera/viewfinder/viewfinder-view/src/main/res-public/values/public_attrs.xml
similarity index 100%
rename from camera/camera-viewfinder/src/main/res-public/values/public_attrs.xml
rename to camera/viewfinder/viewfinder-view/src/main/res-public/values/public_attrs.xml
diff --git a/camera/camera-viewfinder/src/main/res/values/attrs.xml b/camera/viewfinder/viewfinder-view/src/main/res/values/attrs.xml
similarity index 100%
rename from camera/camera-viewfinder/src/main/res/values/attrs.xml
rename to camera/viewfinder/viewfinder-view/src/main/res/values/attrs.xml
diff --git a/camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/CameraViewfinderTest.java b/camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/CameraViewfinderTest.java
similarity index 100%
rename from camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/CameraViewfinderTest.java
rename to camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/CameraViewfinderTest.java
diff --git a/camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/ViewfinderTransformationTest.kt b/camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/ViewfinderTransformationTest.kt
similarity index 100%
rename from camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/ViewfinderTransformationTest.kt
rename to camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/ViewfinderTransformationTest.kt
diff --git a/camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirks.java b/camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirks.java
similarity index 100%
rename from camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirks.java
rename to camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/internal/quirk/DeviceQuirks.java
diff --git a/camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/internal/quirk/QuirkInjector.java b/camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/internal/quirk/QuirkInjector.java
similarity index 100%
rename from camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/internal/quirk/QuirkInjector.java
rename to camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/internal/quirk/QuirkInjector.java
diff --git a/camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewNotCroppedByParentQuirkTest.kt b/camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewNotCroppedByParentQuirkTest.kt
similarity index 100%
rename from camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewNotCroppedByParentQuirkTest.kt
rename to camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewNotCroppedByParentQuirkTest.kt
diff --git a/camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirkTest.java b/camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirkTest.java
similarity index 96%
rename from camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirkTest.java
rename to camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirkTest.java
index 49ea437..18f4af5 100644
--- a/camera/camera-viewfinder/src/test/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirkTest.java
+++ b/camera/viewfinder/viewfinder-view/src/test/java/androidx/camera/viewfinder/internal/quirk/SurfaceViewStretchedQuirkTest.java
@@ -55,7 +55,7 @@
quirkExistsOnDevice("Lenovo", "Q706F");
}
- public void quirkExistsOnDevice(String manufacturer, String device) {
+ private void quirkExistsOnDevice(String manufacturer, String device) {
// Arrange.
ReflectionHelpers.setStaticField(Build.class, "DEVICE", device);
ReflectionHelpers.setStaticField(Build.class, "MANUFACTURER", manufacturer);
diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index c8dd804..e73a6ca 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -65,9 +65,10 @@
docs(project(":camera:camera-testing"))
docs(project(":camera:camera-video"))
docs(project(":camera:camera-view"))
- docs(project(":camera:camera-viewfinder"))
- docs(project(":camera:camera-viewfinder-compose"))
- docs(project(":camera:camera-viewfinder-core"))
+ docs(project(":camera:viewfinder:viewfinder-compose"))
+ docs(project(":camera:viewfinder:viewfinder-core"))
+ samples(project(":camera:viewfinder:viewfinder-core:viewfinder-core-samples"))
+ docs(project(":camera:viewfinder:viewfinder-view"))
docs(project(":car:app:app"))
docs(project(":car:app:app-automotive"))
docs(project(":car:app:app-projected"))
diff --git a/libraryversions.toml b/libraryversions.toml
index e8e662af..2eae337 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -16,7 +16,6 @@
CAMERA_PIPE = "1.0.0-alpha01"
CAMERA_TESTING = "1.0.0-alpha01"
CAMERA_VIEWFINDER = "1.4.0-alpha08"
-CAMERA_VIEWFINDER_COMPOSE = "1.0.0-alpha03"
CARDVIEW = "1.1.0-alpha01"
CAR_APP = "1.7.0-beta01"
COLLECTION = "1.5.0-alpha01"
@@ -193,7 +192,7 @@
CAMERA = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA" }
CAMERA_PIPE = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA_PIPE", overrideInclude = [ ":camera:camera-camera2-pipe", ":camera:camera-camera2-pipe-integration" ] }
CAMERA_TESTING = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA_TESTING", overrideInclude = [ ":camera:camera-testing" ] }
-CAMERA_VIEWFINDER = { group = "androidx.camera", atomicGroupVersion = "versions.CAMERA_VIEWFINDER", overrideInclude = [ ":camera:camera-viewfinder", ":camera:camera-viewfinder-core", ":camera:camera-viewfinder-core:camera-viewfinder-core-samples" ] }
+CAMERA_VIEWFINDER = { group = "androidx.camera.viewfinder", atomicGroupVersion = "versions.CAMERA_VIEWFINDER" }
CARDVIEW = { group = "androidx.cardview", atomicGroupVersion = "versions.CARDVIEW" }
CAR_APP = { group = "androidx.car.app", atomicGroupVersion = "versions.CAR_APP" }
COLLECTION = { group = "androidx.collection", atomicGroupVersion = "versions.COLLECTION" }
diff --git a/settings.gradle b/settings.gradle
index 1049746..3e4ef45 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -420,22 +420,22 @@
includeProject(":camera:camera-lifecycle:camera-lifecycle-samples", "camera/camera-lifecycle/samples", [BuildType.CAMERA])
includeProject(":camera:camera-mlkit-vision", [BuildType.CAMERA])
includeProject(":camera:camera-testing", [BuildType.CAMERA])
+includeProject(":camera:camera-testlib-extensions", [BuildType.CAMERA])
includeProject(":camera:camera-video", [BuildType.CAMERA])
includeProject(":camera:camera-view", [BuildType.CAMERA])
-includeProject(":camera:camera-viewfinder", [BuildType.CAMERA])
-includeProject(":camera:camera-viewfinder-compose", [BuildType.CAMERA])
-includeProject(":camera:camera-viewfinder-core", [BuildType.CAMERA])
-includeProject(":camera:camera-viewfinder-core:camera-viewfinder-core-samples", "camera/camera-viewfinder-core/samples", [BuildType.CAMERA])
includeProject(":camera:integration-tests:camera-testapp-avsync", "camera/integration-tests/avsynctestapp", [BuildType.CAMERA])
includeProject(":camera:integration-tests:camera-testapp-camera2-pipe", "camera/integration-tests/camerapipetestapp", [BuildType.CAMERA])
includeProject(":camera:integration-tests:camera-testapp-core", "camera/integration-tests/coretestapp", [BuildType.CAMERA])
includeProject(":camera:integration-tests:camera-testapp-diagnose", "camera/integration-tests/diagnosetestapp", [BuildType.CAMERA])
includeProject(":camera:integration-tests:camera-testapp-extensions", "camera/integration-tests/extensionstestapp", [BuildType.CAMERA])
-includeProject(":camera:integration-tests:camera-testapp-viewfinder", "camera/integration-tests/viewfindertestapp", [BuildType.CAMERA])
includeProject(":camera:integration-tests:camera-testapp-timing", "camera/integration-tests/timingtestapp", [BuildType.CAMERA])
includeProject(":camera:integration-tests:camera-testapp-uiwidgets", "camera/integration-tests/uiwidgetstestapp", [BuildType.CAMERA])
+includeProject(":camera:integration-tests:camera-testapp-viewfinder", "camera/integration-tests/viewfindertestapp", [BuildType.CAMERA])
includeProject(":camera:integration-tests:camera-testapp-view", "camera/integration-tests/viewtestapp", [BuildType.CAMERA])
-includeProject(":camera:camera-testlib-extensions", [BuildType.CAMERA])
+includeProject(":camera:viewfinder:viewfinder-compose", [BuildType.CAMERA])
+includeProject(":camera:viewfinder:viewfinder-core", [BuildType.CAMERA])
+includeProject(":camera:viewfinder:viewfinder-core:viewfinder-core-samples", "camera/viewfinder/viewfinder-core/samples", [BuildType.CAMERA])
+includeProject(":camera:viewfinder:viewfinder-view", [BuildType.CAMERA])
includeProject(":car:app:app", [BuildType.MAIN])
includeProject(":car:app:app-automotive", [BuildType.MAIN])
includeProject(":car:app:app-projected", [BuildType.MAIN])
