Skip to content

Commit 77b0fce

Browse files
committed
Merge branch '28-oct-platform-android' of github.com:nateshmbhat/flutter_packages into 28-oct-platform-android
2 parents f73a8a8 + 0f38c8c commit 77b0fce

File tree

112 files changed

+2350
-2220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+2350
-2220
lines changed

.ci.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ platform_properties:
3131
{"dependency": "android_sdk", "version": "version:36v3"},
3232
{"dependency": "open_jdk", "version": "version:17"},
3333
{"dependency": "curl", "version": "version:7.64.0"},
34-
{"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"}
34+
{"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"},
35+
{"dependency": "ninja", "version": "version:1.9.0"}
3536
]
3637
linux_android_legacy:
3738
properties:
@@ -47,7 +48,8 @@ platform_properties:
4748
{"dependency": "open_jdk", "version": "version:17"},
4849
{"dependency": "curl", "version": "version:7.64.0"},
4950
{"dependency": "android_virtual_device", "version": "android_31_google_apis_x64.textpb"},
50-
{"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
51+
{"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"},
52+
{"dependency": "ninja", "version": "version:1.9.0"}
5153
]
5254
linux_desktop:
5355
properties:
@@ -93,7 +95,7 @@ platform_properties:
9395
[
9496
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
9597
]
96-
os: Mac-14|Mac-15.5
98+
os: Mac-15.5|Mac-15.7
9799
device_type: none
98100
cpu: arm64
99101
$flutter/osx_sdk : >-
@@ -106,7 +108,7 @@ platform_properties:
106108
[
107109
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
108110
]
109-
os: Mac-14|Mac-15.5
111+
os: Mac-15.5|Mac-15.7
110112
device_type: none
111113
cpu: x86
112114
$flutter/osx_sdk : >-

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6f8abdd77820aeb15bca424dd53ad0bf9ef222aa
1+
c5e809a998fe86bb4a4502d51996504279c67ec5

.ci/scripts/prepare_tool.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
# found in the LICENSE file.
55
set -e
66

7-
# To set FETCH_HEAD for "git merge-base" to work
7+
# Ensure that 'main' is present for diffing.
88
git fetch origin main
9+
git branch main origin/main
910

1011
cd script/tool
1112
dart pub get

CODEOWNERS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ packages/video_player/video_player_avfoundation/** @LongCatIsLooong @
103103
packages/webview_flutter/webview_flutter_wkwebview/** @louisehsu
104104

105105
# - Linux
106-
packages/file_selector/file_selector_linux/** @stuartmorgan-g
107-
packages/image_picker/image_picker_linux/** @stuartmorgan-g
108-
packages/path_provider/path_provider_linux/** @stuartmorgan-g
109-
packages/shared_preferences/shared_preferences_linux/** @stuartmorgan-g
110-
packages/url_launcher/url_launcher_linux/** @stuartmorgan-g
106+
packages/file_selector/file_selector_linux/** @robert-ancell @stuartmorgan-g
107+
packages/image_picker/image_picker_linux/** @robert-ancell @stuartmorgan-g
108+
packages/path_provider/path_provider_linux/** @robert-ancell @stuartmorgan-g
109+
packages/shared_preferences/shared_preferences_linux/** @robert-ancell @stuartmorgan-g
110+
packages/url_launcher/url_launcher_linux/** @robert-ancell @stuartmorgan-g
111111

112112
# - Windows
113113
packages/camera/camera_windows/** @stuartmorgan-g

packages/camera/camera_platform_interface/AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ Anton Borries <[email protected]>
6565
6666
Rahul Raj <[email protected]>
6767
Mairramer <[email protected]>
68+
Rui Craveiro <[email protected]>

packages/camera/camera_platform_interface/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.12.0
2+
3+
* Adds support for video stabilization.
4+
15
## 2.11.0
26

37
* Adds a flag to configure a recording to be persistent across camera changes. See

packages/camera/camera_platform_interface/lib/src/platform_interface/camera_platform.dart

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,34 @@ abstract class CameraPlatform extends PlatformInterface {
281281
throw UnimplementedError('setZoomLevel() is not implemented.');
282282
}
283283

284+
/// Gets a list of video stabilization modes that are supported for the selected camera.
285+
Future<Iterable<VideoStabilizationMode>> getSupportedVideoStabilizationModes(
286+
int cameraId,
287+
) => Future<List<VideoStabilizationMode>>.value(<VideoStabilizationMode>[]);
288+
289+
/// Sets the video stabilization mode for the selected camera.
290+
Future<void> setVideoStabilizationMode(
291+
int cameraId,
292+
VideoStabilizationMode mode,
293+
) {
294+
throw UnimplementedError('setVideoStabilizationMode() is not implemented.');
295+
}
296+
297+
/// Gets the fallback mode of video stabilization [mode].
298+
///
299+
/// This method returns the video stabilization mode that [setVideoStabilizationMode]
300+
/// should set when the device does not support the given [mode].
301+
static VideoStabilizationMode? getFallbackVideoStabilizationMode(
302+
VideoStabilizationMode mode,
303+
) {
304+
return switch (mode) {
305+
VideoStabilizationMode.off => null,
306+
VideoStabilizationMode.level1 => VideoStabilizationMode.off,
307+
VideoStabilizationMode.level2 => VideoStabilizationMode.level1,
308+
VideoStabilizationMode.level3 => VideoStabilizationMode.level2,
309+
};
310+
}
311+
284312
/// Pause the active preview on the current frame for the selected camera.
285313
Future<void> pausePreview(int cameraId) {
286314
throw UnimplementedError('pausePreview() is not implemented.');

packages/camera/camera_platform_interface/lib/src/types/types.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ export 'image_format_group.dart';
1313
export 'media_settings.dart';
1414
export 'resolution_preset.dart';
1515
export 'video_capture_options.dart';
16+
export 'video_stabilization_mode.dart';
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright 2013 The Flutter Authors
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
/// The possible video stabilization modes that can be capturing video.
6+
enum VideoStabilizationMode {
7+
/// Video stabilization is disabled.
8+
off,
9+
10+
/// Least stabilized video stabilization mode with the least latency.
11+
level1,
12+
13+
/// More stabilized video with more latency.
14+
level2,
15+
16+
/// Most stabilized video with the most latency.
17+
level3,
18+
}

packages/camera/camera_platform_interface/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
55
# NOTE: We strongly prefer non-breaking changes, even at the expense of a
66
# less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
7-
version: 2.11.0
7+
version: 2.12.0
88

99
environment:
1010
sdk: ^3.7.0

0 commit comments

Comments
 (0)