Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
743b38d
Merge remote-tracking branch 'upstream/main' into camx_occ
camsim99 May 1, 2023
4427ac6
Undo changes
camsim99 May 10, 2023
3f9cf35
Start wrapping
camsim99 Nov 27, 2023
c37e8cd
Progress, left todo as marker
camsim99 Dec 13, 2023
ad9c29c
More wrapping, start with meteringpoint
camsim99 Dec 13, 2023
8472b7c
Wrapping
camsim99 Dec 26, 2023
886706b
New files
camsim99 Dec 27, 2023
51da157
Finish non cam2 wrpaping
camsim99 Jan 2, 2024
d157b46
Adding tests + docs
camsim99 Jan 3, 2024
4a0872c
More wrapping and tests
camsim99 Jan 4, 2024
aa0f947
More wrapping, tests
camsim99 Jan 5, 2024
05b784d
Final inital wrapping
camsim99 Jan 5, 2024
36257d4
java formatting + fix dart tests
camsim99 Jan 5, 2024
a9af98d
Fix Java classes
camsim99 Jan 8, 2024
4af2266
Get tests running
camsim99 Jan 8, 2024
fb7927b
Fix java tests
camsim99 Jan 8, 2024
b5e974c
Bump version
camsim99 Jan 8, 2024
ba95c41
Self review
camsim99 Jan 9, 2024
c435903
Merge remote-tracking branch 'upstream/main' into camx_cc
camsim99 Jan 9, 2024
be193db
Merge branch 'main' into camx_cc
camsim99 Jan 9, 2024
2e69a9c
Nits
camsim99 Jan 9, 2024
cc4ecee
Merge remote-tracking branch 'refs/remotes/origin/camx_cc' into camx_cc
camsim99 Jan 9, 2024
643fabb
lint
camsim99 Jan 9, 2024
36d9a2e
Update packages/camera/camera_android_camerax/pigeons/camerax_library…
camsim99 Jan 24, 2024
92157c4
Update packages/camera/camera_android_camerax/android/src/test/java/i…
camsim99 Jan 24, 2024
9977463
Update packages/camera/camera_android_camerax/lib/src/camera_control.…
camsim99 Jan 24, 2024
469d0cd
Merge remote-tracking branch 'upstream/main' into camx_cc
camsim99 Jan 24, 2024
cdfd98c
format
camsim99 Jan 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into camx_cc
  • Loading branch information
camsim99 authored Jan 9, 2024
commit be193dbc6d799dbfd8ddc9327fab3638bf2d07d2

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.