Merge flutter main #21
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rApi of JavaObject (flutter#6172)
…gle_maps_flutter/google_maps_flutter_android/android (flutter#6266)
…/camera_android/android (flutter#6265)
…s/quick_actions/quick_actions_android/example/android/app (flutter#6261)
…tter_plugin_android_lifecycle/android (flutter#6246)
Apply new format rules to some dart files. This fixes the flutter -> plugin roll
…pp_purchase/in_app_purchase_android/android (flutter#6259)
…deo_player/video_player_android/example/android/app (flutter#6250)
…uick_actions/quick_actions_android/android (flutter#6248)
…uick_actions/quick_actions_android/example/android/app (flutter#6258)
…pp_purchase/in_app_purchase_android/example/android/app (flutter#6254)
…pp_purchase/in_app_purchase/example/android/app (flutter#6257)
* 7d1323c Updating expiring cirrus key. (flutter/flutter#109461) * a85902a Roll Flutter Engine from de118a55ade0 to c354e0e04cea (2 revisions) (flutter/flutter#109462) * 28de3d4 Roll Flutter Engine from c354e0e04cea to d1b18b5d6811 (1 revision) (flutter/flutter#109466) * a624cb7 Keep `dirty` manipulations private to `Element` base class (flutter/flutter#109401) * dce82f7 Remove deprecated Ruby File.exists? in helper script (flutter/flutter#109428) * 7887ca5 Revert "Keep `dirty` manipulations private to `Element` base class (#109401)" (flutter/flutter#109481) * 237a298 Roll Flutter Engine from d1b18b5d6811 to a2f3bd58ce73 (1 revision) (flutter/flutter#109472) * fe2fc8d Single tap on the previous selection should toggle the toolbar on iOS… (flutter/flutter#108913) * 696c6fb Roll Flutter Engine from a2f3bd58ce73 to fb19700742c3 (6 revisions) (flutter/flutter#109482) * 17bc0ce Roll Flutter Engine from fb19700742c3 to 2180e62f6c7e (1 revision) (flutter/flutter#109483) * 4265015 Roll Flutter Engine from 2180e62f6c7e to cd1a1cb757f5 (1 revision) (flutter/flutter#109488) * c142dd3 Roll Flutter Engine from cd1a1cb757f5 to 5cc5c5f04f0a (1 revision) (flutter/flutter#109490) * 8a55c36 Roll Flutter Engine from 5cc5c5f04f0a to 18dca3de7496 (2 revisions) (flutter/flutter#109493) * d50c5b1 Roll Flutter Engine from 18dca3de7496 to 83771593cb55 (1 revision) (flutter/flutter#109505) * 97901da Cleaner test.dart output. (flutter/flutter#109206) * fb3c8ea Roll Flutter Engine from 83771593cb55 to f49a617535af (1 revision) (flutter/flutter#109509) * 5fcd9c2 Update README.md (flutter/flutter#109506) * 4dd7065 Add onOpened callback to PopupMenuButton (flutter/flutter#103753) * ed3238e Roll Flutter Engine from f49a617535af to cc9f4c63b7e5 (1 revision) (flutter/flutter#109518) * 8b1ca3f Roll Flutter Engine from cc9f4c63b7e5 to 4656c2f46cad (1 revision) (flutter/flutter#109524) * 20ffb32 Roll Flutter Engine from 4656c2f46cad to 16fb19e72f88 (1 revision) (flutter/flutter#109526) * 087750f Roll Flutter Engine from 16fb19e72f88 to 9c3c233e2639 (1 revision) (flutter/flutter#109532) * 4aba124 Roll Flutter Engine from 9c3c233e2639 to f0c3829e90ce (1 revision) (flutter/flutter#109536) * 2bce108 Roll Plugins from 9fb7654 to 094f1c3 (7 revisions) (flutter/flutter#109543) * 97d9a2f Roll Flutter Engine from f0c3829e90ce to 8c019cdd446f (2 revisions) (flutter/flutter#109548) * 458d618 Roll Flutter Engine from 8c019cdd446f to 198b0051a5a2 (1 revision) (flutter/flutter#109552) * c873c21 Roll Flutter Engine from 198b0051a5a2 to 33fccf564973 (1 revision) (flutter/flutter#109557)
…video_player/video_player_android/android (flutter#6247)
…cal_auth/local_auth_android/android (flutter#6256)
…o_player/video_player_android/android (flutter#6142)
…r (1/2) (flutter#6208) Adds a size parameter to the BitmapDescriptor.fromBytes constructor, so web applications can specify the actual physical size of the bitmap. The parameter is not needed (and ignored) in other platforms. Other platforms seem to be doing actual size / dpi to figure out the correct physical size. Fixes (part 1) flutter/flutter#73789
…android_camerax/android (flutter#6272)
…hared_preferences/shared_preferences_android/android (flutter#6264)
…ew_flutter/webview_flutter_android/android (flutter#6260)
…launcher/url_launcher_android/android (flutter#6487)
…nchActivityAfterStarting` test (flutter#6633)
# Conflicts: # packages/webview_flutter/webview_flutter/CHANGELOG.md # packages/webview_flutter/webview_flutter/README.md # packages/webview_flutter/webview_flutter/example/android/build.gradle # packages/webview_flutter/webview_flutter/example/android/gradle/wrapper/gradle-wrapper.properties # packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart # packages/webview_flutter/webview_flutter/example/lib/main.dart # packages/webview_flutter/webview_flutter/pubspec.yaml # packages/webview_flutter/webview_flutter_android/CHANGELOG.md # packages/webview_flutter/webview_flutter_android/android/build.gradle # packages/webview_flutter/webview_flutter_android/android/gradle/wrapper/gradle-wrapper.properties # packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/GeneratedAndroidWebView.java # packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java # packages/webview_flutter/webview_flutter_android/example/android/build.gradle # packages/webview_flutter/webview_flutter_android/example/android/gradle/wrapper/gradle-wrapper.properties # packages/webview_flutter/webview_flutter_android/example/lib/main.dart # packages/webview_flutter/webview_flutter_android/example/pubspec.yaml # packages/webview_flutter/webview_flutter_android/lib/src/android_webview.pigeon.dart # packages/webview_flutter/webview_flutter_android/lib/webview_android_cookie_manager.dart # packages/webview_flutter/webview_flutter_android/lib/webview_android_widget.dart # packages/webview_flutter/webview_flutter_android/pubspec.yaml # packages/webview_flutter/webview_flutter_android/test/test_android_webview.pigeon.dart # packages/webview_flutter/webview_flutter_android/test/webview_android_widget_test.mocks.dart # packages/webview_flutter/webview_flutter_platform_interface/CHANGELOG.md # packages/webview_flutter/webview_flutter_platform_interface/lib/src/method_channel/webview_method_channel.dart # packages/webview_flutter/webview_flutter_platform_interface/lib/src/platform_interface/webview_cookie_manager.dart # packages/webview_flutter/webview_flutter_platform_interface/lib/src/platform_interface/webview_platform.dart # packages/webview_flutter/webview_flutter_platform_interface/lib/src/types/creation_params.dart # packages/webview_flutter/webview_flutter_platform_interface/pubspec.yaml # packages/webview_flutter/webview_flutter_platform_interface/test/src/method_channel/webview_method_channel_test.dart # packages/webview_flutter/webview_flutter_platform_interface/test/src/platform_interface/javascript_channel_registry_test.dart # packages/webview_flutter/webview_flutter_wkwebview/example/README.md # packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart # packages/webview_flutter/webview_flutter_wkwebview/example/ios/Flutter/AppFrameworkInfo.plist # packages/webview_flutter/webview_flutter_wkwebview/example/ios/Podfile # packages/webview_flutter/webview_flutter_wkwebview/example/ios/Runner.xcodeproj/project.pbxproj # packages/webview_flutter/webview_flutter_wkwebview/example/ios/Runner/Info.plist # packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerUITests/FLTWebViewUITests.m # packages/webview_flutter/webview_flutter_wkwebview/example/lib/main.dart # packages/webview_flutter/webview_flutter_wkwebview/example/lib/web_view.dart # packages/webview_flutter/webview_flutter_wkwebview/example/pubspec.yaml # packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FLTCookieManager.m # packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FLTCookieManager_Test.h # packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FlutterWebView.m # packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FlutterWebView_Test.h # packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/webview-umbrella.h # packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit_webview_widget.dart # packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml # packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit_webview_widget_test.dart # packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit_webview_widget_test.mocks.dart # packages/webview_flutter/webview_flutter_wkwebview/test/src/wkwebview_cookie_manager_test.dart
github-actions
bot
added
p: camera
p: espresso
p: file_selector
p: flutter_plugin_android_lifecycle
p: google_maps_flutter
p: google_sign_in
p: image_picker
p: in_app_purchase
p: ios_platform_images
p: local_auth
p: path_provider
p: plugin_platform_interface
p: quick_actions
p: shared_preferences
p: url_launcher
p: video_player
p: webview_flutter
platform-android
platform-ios
platform-linux
platform-macos
platform-web
platform-windows
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I merged the main branch of the flutter plugins branch into your fork, so that your fork is not "841 commits behind"
This is equal to #19 just that I accidentally created the fork in the wrong org.