Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
dec3d69
Merge remote-tracking branch 'upstream/main' into camx_occ
camsim99 May 1, 2023
0e0333b
Merge remote-tracking branch 'upstream/main'
camsim99 May 2, 2023
bd7ac99
Merge remote-tracking branch 'upstream/main'
camsim99 May 3, 2023
5c3363b
Merge remote-tracking branch 'upstream/main'
camsim99 May 10, 2023
fed9621
Undo changes
camsim99 May 10, 2023
5aabe34
Merge remote-tracking branch 'upstream/main'
camsim99 May 12, 2023
2b9a352
Merge remote-tracking branch 'upstream/main'
camsim99 May 25, 2023
a1173da
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cbc3d6b
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cae5a4c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 1, 2023
72283db
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
166a77c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
399780e
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 14, 2023
8d5d0e7
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 26, 2023
084d960
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 12, 2023
d2a59ac
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 17, 2023
a1422bf
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 17, 2023
bdd87a6
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 18, 2023
137a28b
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 19, 2023
bc0db5a
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 20, 2023
b6f1c5f
start dev
camsim99 Jul 20, 2023
ebfccb7
Dev
camsim99 Jul 21, 2023
b21d1c2
wrap minus tests and cleanup
camsim99 Jul 25, 2023
10cb737
Add new files
camsim99 Jul 27, 2023
64d903e
Dart tests
camsim99 Aug 1, 2023
6b7c70e
Fix recorder test
camsim99 Aug 1, 2023
b975b1d
Modify java side
camsim99 Aug 1, 2023
89c76b5
Working on java tests
camsim99 Aug 2, 2023
cddc3cd
Fix java tests
camsim99 Aug 2, 2023
802218b
Remove unecessary verify
camsim99 Aug 3, 2023
52e49ee
Merge remote-tracking branch 'upstream/main' into camx_vidres1
camsim99 Aug 3, 2023
fb99807
Cleanup
camsim99 Aug 3, 2023
0d6f7b9
Bump version
camsim99 Aug 3, 2023
55eeb17
Fix lint and add test for recorder
camsim99 Aug 8, 2023
7f58a16
Merge branch 'main' into camx_vidres1
camsim99 Aug 8, 2023
949e20d
Merge remote-tracking branch 'upstream/main' into camx_vidres1
camsim99 Aug 14, 2023
8c77fab
Update packages/camera/camera_android_camerax/lib/src/fallback_strate…
camsim99 Aug 14, 2023
24e7ea5
Update packages/camera/camera_android_camerax/lib/src/quality_selecto…
camsim99 Aug 14, 2023
b62c11d
Update packages/camera/camera_android_camerax/lib/src/quality_selecto…
camsim99 Aug 14, 2023
acde675
Update packages/camera/camera_android_camerax/lib/src/quality_selecto…
camsim99 Aug 14, 2023
957d4fa
Update packages/camera/camera_android_camerax/lib/src/quality_selecto…
camsim99 Aug 14, 2023
8bbacb8
Update packages/camera/camera_android_camerax/lib/src/quality_selecto…
camsim99 Aug 14, 2023
6f29185
Update packages/camera/camera_android_camerax/pigeons/camerax_library…
camsim99 Aug 14, 2023
9c5c436
Address review
camsim99 Aug 14, 2023
0ace4e2
Merge branch 'camx_vidres1' of github.com:camsim99/packages into camx…
camsim99 Aug 14, 2023
9887f33
Update packages/camera/camera_android_camerax/android/src/main/java/i…
camsim99 Aug 15, 2023
cd73662
Update packages/camera/camera_android_camerax/android/src/main/java/i…
camsim99 Aug 15, 2023
a42a5dc
Update packages/camera/camera_android_camerax/lib/src/fallback_strate…
camsim99 Aug 15, 2023
6db0529
Merge branch 'main' into camx_vidres1
camsim99 Aug 15, 2023
eb8ea0c
Fix format
camsim99 Aug 15, 2023
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 remote-tracking branch 'upstream/main'
  • Loading branch information
camsim99 committed Jun 14, 2023
commit 399780e27d24ee0e916eace40bfd7c50a17d65c2

This merge commit was added into this branch cleanly.

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