DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Migrate embedding to AndroidX (#17075)

Browse Source
This commit is contained in:
Emmanuel Garcia 2020-03-13 21:19:24 -07:00 committed by GitHub
parent cedddb7075
commit 025e2d82dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
106 changed files with 454 additions and 551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
DEPS
View File

@ -497,11 +497,11 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/robolectric': {
'src/third_party/android_embedding_dependencies': {
'packages': [
{
'package': 'flutter/android/robolectric_bundle',
'version': 'last_updated:2019-09-09T16:47:38-0700'
'package': 'flutter/android/embedding_bundle',
'version': 'last_updated:2020-03-13T15:42:26-0700'
}
],
'condition': 'download_android_deps',
@ -593,15 +593,6 @@ hooks = [
'pattern': '.',
'action': ['python', 'src/build/vs_toolchain.py', 'update'],
},
{
'name': 'download_android_support',
'pattern': '.',
'condition': 'download_android_deps',
'action': [
'python',
'src/flutter/tools/android_support/download_android_support.py',
],
},
{
'name': 'generate_package_files',
'pattern': '.',

290
ci/licenses_golden/licenses_fuchsia
View File

@ -3086,6 +3086,151 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: fuchsia_sdk
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/netboot.h + ../../../fuchsia/sdk/linux/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/assert.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/netboot.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/compiler.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/driver/binding.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/errors.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/i2c.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb/audio.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb/hid.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb/hub.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb/ums.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/listnode.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/pixelformat.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/processargs.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/status.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/debug.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/exception.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/log.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/object.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/pci.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/port.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/profile.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/resource.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/types.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/types.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/assert.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/netboot.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/compiler.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/driver/binding.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/errors.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/i2c.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb/audio.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb/hid.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb/hub.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb/ums.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/listnode.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/pixelformat.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/processargs.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/status.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/debug.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/exception.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/log.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/object.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/pci.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/port.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/profile.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/resource.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/types.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/types.h
FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/interface.dart
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.runner/component_runner.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/font_provider.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.math/math.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/problem.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/seeking_reader.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/basemgr/base_shell.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/basemgr/user_provider.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module/module_context.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module/module_controller.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session/focus.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session/session_shell.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story/story_controller.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story/story_info.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story/story_provider.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.oldhttp/url_body.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/component_controller.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/environment.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/environment_controller.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/launcher.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/loader.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/runner.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.provider/provider.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/presenter.fidl
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/fdio.h
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/io.h
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/vfs.h
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/watcher.h
FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/include/lib/media/cpp/timeline_function.h
FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/include/lib/media/cpp/timeline_rate.h
FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/timeline_function.cc
FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/timeline_rate.cc
FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/completion.h
FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/termination_reason.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/channel.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/event.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/eventpair.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/channel.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/event.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/eventpair.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/job.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/object.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/object_traits.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/port.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/process.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/socket.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/task.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/thread.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/time.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vmar.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vmo.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/job.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/port.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/process.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/socket.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/thread.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/vmar.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/vmo.cc
----------------------------------------------------------------------------------------------------
Copyright 2016 The Fuchsia Authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: fuchsia_sdk
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
@ -3330,151 +3475,6 @@ distribution.
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================
====================================================================================================
LIBRARY: fuchsia_sdk
ORIGIN: ../../../third_party/tonic/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/assert.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/netboot.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/compiler.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/driver/binding.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/errors.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/i2c.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb/audio.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb/hid.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb/hub.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/usb/ums.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/listnode.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/pixelformat.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/processargs.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/status.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/debug.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/exception.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/log.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/object.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/pci.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/port.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/profile.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/resource.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/types.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/types.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/assert.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/netboot.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/compiler.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/driver/binding.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/errors.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/i2c.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb/audio.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb/hid.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb/hub.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/usb/ums.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/listnode.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/pixelformat.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/processargs.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/status.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/debug.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/exception.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/log.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/object.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/pci.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/port.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/profile.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/resource.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/types.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/types.h
FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/interface.dart
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.runner/component_runner.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/font_provider.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.math/math.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/problem.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/seeking_reader.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/basemgr/base_shell.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/basemgr/user_provider.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module/module_context.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module/module_controller.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session/focus.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session/session_shell.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story/story_controller.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story/story_info.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story/story_provider.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.oldhttp/url_body.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/component_controller.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/environment.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/environment_controller.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/launcher.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/loader.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/runner.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.provider/provider.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/presenter.fidl
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/fdio.h
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/io.h
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/vfs.h
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/watcher.h
FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/include/lib/media/cpp/timeline_function.h
FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/include/lib/media/cpp/timeline_rate.h
FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/timeline_function.cc
FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/timeline_rate.cc
FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/completion.h
FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/termination_reason.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/channel.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/event.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/eventpair.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/channel.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/event.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/eventpair.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/job.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/object.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/object_traits.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/port.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/process.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/socket.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/task.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/thread.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/time.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vmar.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vmo.h
FILE: ../../../fuchsia/sdk/linux/pkg/zx/job.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/port.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/process.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/socket.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/thread.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/vmar.cc
FILE: ../../../fuchsia/sdk/linux/pkg/zx/vmo.cc
----------------------------------------------------------------------------------------------------
Copyright 2016 The Fuchsia Authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

2
ci/licenses_golden/tool_signature
View File

@ -1,2 +1,2 @@
Signature: 9ad4afaa43bd81d0e6a011688ca40377
Signature: c182c713338fa4bfd82bfab82778038b

52
shell/platform/android/BUILD.gn
View File

@ -228,15 +228,14 @@ android_java_sources = [
"io/flutter/view/VsyncWaiter.java",
]
android_support_jars = [
"//third_party/android_support/android_support_compat.jar",
"//third_party/android_support/android_support_annotations.jar",
"//third_party/android_support/android_support_fragment.jar",
"//third_party/android_support/android_arch_lifecycle_common.jar",
"//third_party/android_support/android_arch_lifecycle_common_java8.jar",
"//third_party/android_support/android_arch_lifecycle_runtime.jar",
"//third_party/android_support/android_arch_lifecycle_viewmodel.jar",
]
list_script = rebase_path("//build/ls.py", ".", "//")
embedding_dependencies_jars =
exec_script(list_script,
[
"--target-directory",
rebase_path("//third_party/android_embedding_dependencies"),
],
"list lines")
action("flutter_shell_java") {
script = "//build/android/gyp/javac.py"
@ -256,10 +255,7 @@ action("flutter_shell_java") {
source_jar_path,
source_jar_path + ".md5.stamp",
]
inputs = [
android_sdk_jar,
]
inputs += android_support_jars
inputs = [ android_sdk_jar ] + embedding_dependencies_jars
_rebased_current_path = rebase_path(".")
_rebased_jar_path = rebase_path(jar_path, root_build_dir)
@ -267,7 +263,7 @@ action("flutter_shell_java") {
_rebased_depfile = rebase_path(depfile, root_build_dir)
_rebased_android_sdk_jar = rebase_path(android_sdk_jar, root_build_dir)
_rebased_classpath = [ _rebased_android_sdk_jar ] +
rebase_path(android_support_jars, root_build_dir)
rebase_path(embedding_dependencies_jars, root_build_dir)
args = [
"--depfile=$_rebased_depfile",
@ -357,10 +353,10 @@ action("android_jar") {
}
action("pom_libflutter") {
script = "//flutter/tools/android_support/generate_pom_file.py"
script = "//flutter/tools/androidx/generate_pom_file.py"
inputs = [
"//flutter/tools/android_support/files.json",
"//flutter/tools/androidx/files.json",
]
artifact_id =
@ -381,10 +377,10 @@ action("pom_libflutter") {
}
action("pom_embedding") {
script = "//flutter/tools/android_support/generate_pom_file.py"
script = "//flutter/tools/androidx/generate_pom_file.py"
inputs = [
"//flutter/tools/android_support/files.json",
"//flutter/tools/androidx/files.json",
]
artifact_id = "flutter_embedding_$flutter_runtime_mode"
@ -451,21 +447,9 @@ action("robolectric_tests") {
]
_jar_dependencies = [
android_sdk_jar,
embedding_jar_path,
"//third_party/robolectric/lib/junit-3.8.jar",
"//third_party/robolectric/lib/junit-4.13-beta-3.jar",
"//third_party/robolectric/lib/robolectric-3.8.jar",
"//third_party/robolectric/lib/shadows-framework-3.8.jar",
"//third_party/robolectric/lib/annotations-3.8.jar",
"//third_party/robolectric/lib/shadowapi-3.8.jar",
"//third_party/robolectric/lib/runtime-1.1.1.jar",
"//third_party/robolectric/lib/common-1.1.1.jar",
"//third_party/robolectric/lib/common-java8-1.1.1.jar",
"//third_party/robolectric/lib/support-annotations-28.0.0.jar",
"//third_party/robolectric/lib/support-fragment-25.2.0.jar",
"//third_party/robolectric/lib/mockito-all-1.10.19.jar",
]
android_sdk_jar,
embedding_jar_path,
] + embedding_dependencies_jars
inputs = _jar_dependencies
@ -532,7 +516,7 @@ zip_bundle("android") {
# https://github.com/flutter/flutter/issues/42400
action("gen_android_javadoc") {
script = "//flutter/tools/gen_javadoc.py"
sources = android_java_sources + android_support_jars
sources = android_java_sources + embedding_dependencies_jars
outputs = [
"$target_gen_dir/javadocs",

3
shell/platform/android/embedding_bundle/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
# Don't include the jars in the engine repo.
lib/
.gradle

22
shell/platform/android/embedding_bundle/build.gradle
View File

@ -44,27 +44,23 @@ android {
embedding "androidx.fragment:fragment:1.1.0"
def lifecycle_version = "2.2.0"
embedding "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
embedding "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
embedding "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
embedding "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
embedding "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
embedding "androidx.lifecycle:lifecycle-common:$lifecycle_version"
embedding "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
embedding "androidx.lifecycle:lifecycle-service:$lifecycle_version"
embedding "androidx.lifecycle:lifecycle-process:$lifecycle_version"
embedding "androidx.lifecycle:lifecycle-reactivestreams:$lifecycle_version"
// Testing
embeddingTesting "androidx.arch.core:core-testing:2.1.0"
embeddingTesting "org.robolectric:android-all:8.1.0-robolectric-4611349"
// This is required by the robolectric test.
embeddingTesting_duplicated "org.robolectric:android-all:4.1.2_r1-robolectric-r1"
embeddingTesting "org.robolectric:robolectric:3.8"
embeddingTesting "org.robolectric:junit:3.8"
embeddingTesting "org.robolectric:shadows-framework:3.8"
embeddingTesting "org.robolectric:resources:3.8"
embeddingTesting "org.mockito:mockito-all:1.10.19"
embeddingTesting "junit:junit:4.13-beta-3"
embeddingTesting ("org.robolectric:robolectric:4.3") {
// org.hamcrest is added by org.mockito:mockito-all
exclude group: "org.hamcrest", module:"hamcrest-core"
}
embeddingTesting ("junit:junit:4.13") {
// org.hamcrest is added by org.mockito:mockito-all
exclude group: "org.hamcrest", module:"hamcrest-core"
}
}
}

2
shell/platform/android/io/flutter/Log.java
View File

@ -4,7 +4,7 @@
package io.flutter;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* Port of {@link android.util.Log} that only logs in {@link io.flutter.BuildConfig#DEBUG} mode and

2
shell/platform/android/io/flutter/app/FlutterActivity.java
View File

@ -9,7 +9,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import io.flutter.app.FlutterActivityDelegate.ViewFactory;
import io.flutter.plugin.common.PluginRegistry;
import io.flutter.view.FlutterNativeView;

2
shell/platform/android/io/flutter/app/FlutterApplication.java
View File

@ -6,7 +6,7 @@ package io.flutter.app;
import android.app.Activity;
import android.app.Application;
import android.support.annotation.CallSuper;
import androidx.annotation.CallSuper;
import io.flutter.view.FlutterMain;
/**

4
shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
View File

@ -8,7 +8,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.FragmentActivity;
import io.flutter.app.FlutterActivityDelegate.ViewFactory;
import io.flutter.plugin.common.PluginRegistry;
import io.flutter.view.FlutterNativeView;
@ -25,7 +25,7 @@ import io.flutter.view.FlutterView;
* app to ensure that {@link FragmentActivity} is available at runtime.
*
* @see <a target="_new"
* href="https://developer.android.com/topic/libraries/support-library/setup.html">https://developer.android.com/topic/libraries/support-library/setup.html</a>
* href="https://developer.android.com/training/testing/set-up-project">https://developer.android.com/training/testing/set-up-project</a>
*/
public class FlutterFragmentActivity extends FragmentActivity
implements FlutterView.Provider, PluginRegistry, ViewFactory {

4
shell/platform/android/io/flutter/embedding/android/AndroidKeyProcessor.java
View File

@ -4,10 +4,10 @@
package io.flutter.embedding.android;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.embedding.engine.systemchannels.KeyEventChannel;
import io.flutter.plugin.editing.TextInputPlugin;

4
shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
View File

@ -1,10 +1,10 @@
package io.flutter.embedding.android;
import android.os.Build;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;
import android.view.InputDevice;
import android.view.MotionEvent;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import io.flutter.embedding.engine.renderer.FlutterRenderer;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;

4
shell/platform/android/io/flutter/embedding/android/DrawableSplashScreen.java
View File

@ -8,11 +8,11 @@ import android.animation.Animator;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
/**
* {@link SplashScreen} that displays a given {@link Drawable}, which then fades its alpha to zero

12
shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
View File

@ -17,9 +17,6 @@ import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.NORMAL_T
import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY;
import android.app.Activity;
import android.arch.lifecycle.Lifecycle;
import android.arch.lifecycle.LifecycleOwner;
import android.arch.lifecycle.LifecycleRegistry;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@ -30,12 +27,15 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.LifecycleRegistry;
import io.flutter.Log;
import io.flutter.embedding.android.FlutterActivityLaunchConfigs.BackgroundMode;
import io.flutter.embedding.engine.FlutterEngine;

8
shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java
View File

@ -7,17 +7,17 @@ package io.flutter.embedding.android;
import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW;
import android.app.Activity;
import android.arch.lifecycle.Lifecycle;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle;
import io.flutter.Log;
import io.flutter.app.FlutterActivity;
import io.flutter.embedding.engine.FlutterEngine;

6
shell/platform/android/io/flutter/embedding/android/FlutterEngineConfigurator.java
View File

@ -5,14 +5,14 @@
package io.flutter.embedding.android;
import android.app.Activity;
import android.arch.lifecycle.Lifecycle;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
import io.flutter.embedding.engine.FlutterEngine;
/**
* Configures a {@link FlutterEngine} after it is created, e.g., adds plugins.
*
* <p>This interface may be applied to a {@link android.support.v4.app.FragmentActivity} that owns a
* <p>This interface may be applied to a {@link androidx.fragment.app.FragmentActivity} that owns a
* {@code FlutterFragment}.
*/
public interface FlutterEngineConfigurator {

4
shell/platform/android/io/flutter/embedding/android/FlutterEngineProvider.java
View File

@ -5,8 +5,8 @@
package io.flutter.embedding.android;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.embedding.engine.FlutterEngine;
/**

12
shell/platform/android/io/flutter/embedding/android/FlutterFragment.java
View File

@ -5,18 +5,18 @@
package io.flutter.embedding.android;
import android.app.Activity;
import android.arch.lifecycle.Lifecycle;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.Lifecycle;
import io.flutter.Log;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.FlutterShellArgs;

8
shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java
View File

@ -26,15 +26,15 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import io.flutter.Log;
import io.flutter.embedding.android.FlutterActivityLaunchConfigs.BackgroundMode;
import io.flutter.embedding.engine.FlutterEngine;

6
shell/platform/android/io/flutter/embedding/android/FlutterSplashView.java
View File

@ -8,12 +8,12 @@ import android.content.Context;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.Keep;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.FrameLayout;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.Log;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;

4
shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java
View File

@ -6,11 +6,11 @@ package io.flutter.embedding.android;
import android.content.Context;
import android.graphics.PixelFormat;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.Log;
import io.flutter.embedding.engine.renderer.FlutterRenderer;
import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;

4
shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
View File

@ -6,11 +6,11 @@ package io.flutter.embedding.android;
import android.content.Context;
import android.graphics.SurfaceTexture;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.view.Surface;
import android.view.TextureView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.Log;
import io.flutter.embedding.engine.renderer.FlutterRenderer;
import io.flutter.embedding.engine.renderer.RenderSurface;

8
shell/platform/android/io/flutter/embedding/android/FlutterView.java
View File

@ -12,10 +12,6 @@ import android.graphics.Insets;
import android.graphics.Rect;
import android.os.Build;
import android.os.LocaleList;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import android.support.annotation.VisibleForTesting;
import android.text.format.DateFormat;
import android.util.AttributeSet;
import android.view.KeyEvent;
@ -27,6 +23,10 @@ import android.view.accessibility.AccessibilityNodeProvider;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.VisibleForTesting;
import io.flutter.Log;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.renderer.FlutterRenderer;

4
shell/platform/android/io/flutter/embedding/android/SplashScreen.java
View File

@ -7,9 +7,9 @@ package io.flutter.embedding.android;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
/**
* Splash screen configuration for a given Flutter experience.

2
shell/platform/android/io/flutter/embedding/android/SplashScreenProvider.java
View File

@ -4,7 +4,7 @@
package io.flutter.embedding.android;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
/**
* Provides a {@link SplashScreen} to display while Flutter initializes and renders its first frame.

4
shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
View File

@ -5,8 +5,8 @@
package io.flutter.embedding.engine;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.Log;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.embedding.engine.loader.FlutterLoader;

6
shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java
View File

@ -4,9 +4,9 @@
package io.flutter.embedding.engine;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import java.util.HashMap;
import java.util.Map;

6
shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java
View File

@ -6,14 +6,14 @@ package io.flutter.embedding.engine;
import android.app.Activity;
import android.app.Service;
import android.arch.lifecycle.Lifecycle;
import android.content.BroadcastReceiver;
import android.content.ContentProvider;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Lifecycle;
import io.flutter.Log;
import io.flutter.embedding.engine.loader.FlutterLoader;
import io.flutter.embedding.engine.plugins.FlutterPlugin;

10
shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
View File

@ -9,13 +9,13 @@ import android.content.res.AssetManager;
import android.graphics.Bitmap;
import android.graphics.SurfaceTexture;
import android.os.Looper;
import android.support.annotation.Keep;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.UiThread;
import android.support.annotation.VisibleForTesting;
import android.view.Surface;
import android.view.SurfaceHolder;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
import androidx.annotation.VisibleForTesting;
import io.flutter.Log;
import io.flutter.embedding.engine.FlutterEngine.EngineLifecycleListener;
import io.flutter.embedding.engine.dart.PlatformMessageHandler;

2
shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
View File

@ -6,7 +6,7 @@ package io.flutter.embedding.engine;
import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.*;
/**

6
shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java
View File

@ -5,9 +5,9 @@
package io.flutter.embedding.engine.dart;
import android.content.res.AssetManager;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.UiThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
import io.flutter.Log;
import io.flutter.embedding.engine.FlutterJNI;
import io.flutter.plugin.common.BinaryMessenger;

6
shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java
View File

@ -4,9 +4,9 @@
package io.flutter.embedding.engine.dart;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.UiThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
import io.flutter.Log;
import io.flutter.embedding.engine.FlutterJNI;
import io.flutter.plugin.common.BinaryMessenger;

4
shell/platform/android/io/flutter/embedding/engine/dart/PlatformMessageHandler.java
View File

@ -4,8 +4,8 @@
package io.flutter.embedding.engine.dart;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
/** Handler that receives messages from Dart code. */
public interface PlatformMessageHandler {

4
shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
View File

@ -12,10 +12,10 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Log;
import android.view.WindowManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.BuildConfig;
import io.flutter.embedding.engine.FlutterJNI;
import io.flutter.util.PathUtils;

4
shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java
View File

@ -11,9 +11,9 @@ import android.content.pm.PackageManager;
import android.content.res.AssetManager;
import android.os.AsyncTask;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.WorkerThread;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
import io.flutter.BuildConfig;
import java.io.*;
import java.util.ArrayList;

4
shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java
View File

@ -4,9 +4,9 @@
package io.flutter.embedding.engine.plugins;
import android.arch.lifecycle.Lifecycle;
import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.platform.PlatformViewRegistry;

4
shell/platform/android/io/flutter/embedding/engine/plugins/PluginRegistry.java
View File

@ -4,8 +4,8 @@
package io.flutter.embedding.engine.plugins;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Set;
public interface PluginRegistry {

2
shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityAware.java
View File

@ -4,7 +4,7 @@
package io.flutter.embedding.engine.plugins.activity;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* {@link FlutterPlugin} that is interested in {@link Activity} lifecycle events related to a {@link

6
shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityControlSurface.java
View File

@ -5,11 +5,11 @@
package io.flutter.embedding.engine.plugins.activity;
import android.app.Activity;
import android.arch.lifecycle.Lifecycle;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Lifecycle;
/**
* Control surface through which an {@link Activity} attaches to a {@link FlutterEngine}.

4
shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java
View File

@ -6,8 +6,8 @@ package io.flutter.embedding.engine.plugins.activity;
import android.app.Activity;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.plugin.common.PluginRegistry;
/**

2
shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverAware.java
View File

@ -4,7 +4,7 @@
package io.flutter.embedding.engine.plugins.broadcastreceiver;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* A {@link FlutterPlugin} that wants to know when it is running within a {@link BroadcastReceiver}.

4
shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverControlSurface.java
View File

@ -4,9 +4,9 @@
package io.flutter.embedding.engine.plugins.broadcastreceiver;
import android.arch.lifecycle.Lifecycle;
import android.content.BroadcastReceiver;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
/**
* Control surface through which a {@link BroadcastReceiver} attaches to a {@link FlutterEngine}.

2
shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverPluginBinding.java
View File

@ -5,7 +5,7 @@
package io.flutter.embedding.engine.plugins.broadcastreceiver;
import android.content.BroadcastReceiver;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* Binding that gives {@link BroadcastReceiverAware} plugins access to an associated {@link

2
shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderAware.java
View File

@ -4,7 +4,7 @@
package io.flutter.embedding.engine.plugins.contentprovider;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* A {@link FlutterPlugin} that wants to know when it is running within a {@link ContentProvider}.

4
shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderControlSurface.java
View File

@ -4,9 +4,9 @@
package io.flutter.embedding.engine.plugins.contentprovider;
import android.arch.lifecycle.Lifecycle;
import android.content.ContentProvider;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
/**
* Control surface through which a {@link ContentProvider} attaches to a {@link FlutterEngine}.

2
shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderPluginBinding.java
View File

@ -5,7 +5,7 @@
package io.flutter.embedding.engine.plugins.contentprovider;
import android.content.ContentProvider;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* Binding that gives {@link ContentProviderAware} plugins access to an associated {@link

6
shell/platform/android/io/flutter/embedding/engine/plugins/lifecycle/HiddenLifecycleReference.java
View File

@ -4,9 +4,9 @@
package io.flutter.embedding.engine.plugins.lifecycle;
import android.arch.lifecycle.Lifecycle;
import android.support.annotation.Keep;
import android.support.annotation.NonNull;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
/**
* An {@code Object} that can be used to obtain a {@link Lifecycle} reference.

2
shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java
View File

@ -4,7 +4,7 @@
package io.flutter.embedding.engine.plugins.service;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/** A {@link FlutterPlugin} that wants to know when it is running within a {@link Service}. */
public interface ServiceAware {

6
shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java
View File

@ -5,9 +5,9 @@
package io.flutter.embedding.engine.plugins.service;
import android.app.Service;
import android.arch.lifecycle.Lifecycle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Lifecycle;
/**
* Control surface through which a {@link Service} attaches to a {@link FlutterEngine}.

4
shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java
View File

@ -5,8 +5,8 @@
package io.flutter.embedding.engine.plugins.service;
import android.app.Service;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
/** Binding that gives {@link ServiceAware} plugins access to an associated {@link Service}. */
public interface ServicePluginBinding {

18
shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
View File

@ -4,7 +4,7 @@
package io.flutter.embedding.engine.plugins.shim;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import io.flutter.Log;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
@ -21,14 +21,18 @@ import java.util.Set;
* plugin API behind the scenes.
*
* <p>The following is an example usage of {@code ShimPluginRegistry} within a {@code
* FlutterActivity}: {@code // Create the FlutterEngine that will back the Flutter UI. FlutterEngine
* flutterEngine = new FlutterEngine(context);
* FlutterActivity}:
*
* <p>// Create a ShimPluginRegistry and wrap the FlutterEngine with the shim. ShimPluginRegistry
* shimPluginRegistry = new ShimPluginRegistry(flutterEngine, platformViewsController);
* <pre>
* // Create the FlutterEngine that will back the Flutter UI.
* FlutterEngine flutterEngine = new FlutterEngine(context);
*
* <p>// Use the GeneratedPluginRegistrant to add every plugin that's in the pubspec.
* GeneratedPluginRegistrant.registerWith(shimPluginRegistry); }
* // Create a ShimPluginRegistry and wrap the FlutterEngine with the shim.
* ShimPluginRegistry shimPluginRegistry = new ShimPluginRegistry(flutterEngine, platformViewsController);
*
* // Use the GeneratedPluginRegistrant to add every plugin that's in the pubspec.
* GeneratedPluginRegistrant.registerWith(shimPluginRegistry);
* </pre>
*/
public class ShimPluginRegistry implements PluginRegistry {
private static final String TAG = "ShimPluginRegistry";

2
shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java
View File

@ -6,7 +6,7 @@ package io.flutter.embedding.engine.plugins.shim;
import android.app.Activity;
import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import io.flutter.Log;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.embedding.engine.plugins.activity.ActivityAware;

4
shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
View File

@ -9,9 +9,9 @@ import android.graphics.Bitmap;
import android.graphics.SurfaceTexture;
import android.os.Build;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.Surface;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.Log;
import io.flutter.embedding.engine.FlutterJNI;
import io.flutter.view.TextureRegistry;

4
shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java
View File

@ -4,9 +4,9 @@
package io.flutter.embedding.engine.renderer;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.Surface;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
/**
* Owns a {@code Surface} that {@code FlutterRenderer} would like to paint.

4
shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java
View File

@ -1,7 +1,7 @@
package io.flutter.embedding.engine.systemchannels;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.Log;
import io.flutter.embedding.engine.FlutterJNI;
import io.flutter.embedding.engine.dart.DartExecutor;

4
shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyEventChannel.java
View File

@ -5,10 +5,10 @@
package io.flutter.embedding.engine.systemchannels;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.InputDevice;
import android.view.KeyEvent;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.plugin.common.BasicMessageChannel;
import io.flutter.plugin.common.JSONMessageCodec;

2
shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java
View File

@ -4,7 +4,7 @@
package io.flutter.embedding.engine.systemchannels;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import io.flutter.Log;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.plugin.common.BasicMessageChannel;

2
shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java
View File

@ -5,7 +5,7 @@
package io.flutter.embedding.engine.systemchannels;
import android.os.Build;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import io.flutter.Log;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.plugin.common.JSONMethodCodec;

4
shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java
View File

@ -4,8 +4,8 @@
package io.flutter.embedding.engine.systemchannels;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.Log;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.plugin.common.JSONMethodCodec;

6
shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java
View File

@ -6,9 +6,9 @@ package io.flutter.embedding.engine.systemchannels;
import android.content.pm.ActivityInfo;
import android.graphics.Rect;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import io.flutter.Log;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.plugin.common.JSONMethodCodec;

4
shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java
View File

@ -4,8 +4,8 @@
package io.flutter.embedding.engine.systemchannels;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.Log;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.plugin.common.MethodCall;

2
shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java
View File

@ -1,6 +1,6 @@
package io.flutter.embedding.engine.systemchannels;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import io.flutter.Log;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.plugin.common.BasicMessageChannel;

2
shell/platform/android/io/flutter/embedding/engine/systemchannels/SystemChannel.java
View File

@ -4,7 +4,7 @@
package io.flutter.embedding.engine.systemchannels;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import io.flutter.Log;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.plugin.common.BasicMessageChannel;

4
shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
View File

@ -1,8 +1,8 @@
package io.flutter.embedding.engine.systemchannels;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.inputmethod.EditorInfo;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.Log;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.plugin.common.JSONMethodCodec;

6
shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java
View File

@ -4,10 +4,10 @@
package io.flutter.plugin.common;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.UiThread;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
import io.flutter.BuildConfig;
import io.flutter.plugin.common.BinaryMessenger.BinaryMessageHandler;
import io.flutter.plugin.common.BinaryMessenger.BinaryReply;

6
shell/platform/android/io/flutter/plugin/common/BinaryMessenger.java
View File

@ -4,9 +4,9 @@
package io.flutter.plugin.common;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.UiThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
import java.nio.ByteBuffer;
/**

2
shell/platform/android/io/flutter/plugin/common/ErrorLogResult.java
View File

@ -4,8 +4,8 @@
package io.flutter.plugin.common;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import io.flutter.BuildConfig;
/**

2
shell/platform/android/io/flutter/plugin/common/EventChannel.java
View File

@ -4,8 +4,8 @@
package io.flutter.plugin.common;
import android.support.annotation.UiThread;
import android.util.Log;
import androidx.annotation.UiThread;
import io.flutter.BuildConfig;
import io.flutter.plugin.common.BinaryMessenger.BinaryMessageHandler;
import io.flutter.plugin.common.BinaryMessenger.BinaryReply;

2
shell/platform/android/io/flutter/plugin/common/MessageCodec.java
View File

@ -4,7 +4,7 @@
package io.flutter.plugin.common;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
/**

2
shell/platform/android/io/flutter/plugin/common/MethodCall.java
View File

@ -4,7 +4,7 @@
package io.flutter.plugin.common;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import io.flutter.BuildConfig;
import java.util.Map;
import org.json.JSONObject;

6
shell/platform/android/io/flutter/plugin/common/MethodChannel.java
View File

@ -4,10 +4,10 @@
package io.flutter.plugin.common;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.UiThread;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
import io.flutter.BuildConfig;
import io.flutter.plugin.common.BinaryMessenger.BinaryMessageHandler;
import io.flutter.plugin.common.BinaryMessenger.BinaryReply;

2
shell/platform/android/io/flutter/plugin/common/PluginRegistry.java
View File

@ -219,7 +219,7 @@ public interface PluginRegistry {
/**
* Adds a callback allowing the plugin to take part in handling incoming calls to {@code
* Activity#onRequestPermissionsResult(int, String[], int[])} or {@code
* android.support.v4.app.ActivityCompat.OnRequestPermissionsResultCallback#onRequestPermissionsResult(int,
* androidx.core.app.ActivityCompat.OnRequestPermissionsResultCallback#onRequestPermissionsResult(int,
* String[], int[])}.
*
* <p>This registrar is for Flutter's v1 embedding. To listen for permission results in the v2

6
shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java
View File

@ -8,9 +8,6 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Build;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.text.Editable;
import android.text.InputType;
import android.text.Selection;
@ -20,6 +17,9 @@ import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.embedding.engine.systemchannels.TextInputChannel;
import io.flutter.plugin.platform.PlatformViewsController;

4
shell/platform/android/io/flutter/plugin/platform/AccessibilityEventsDelegate.java
View File

@ -4,10 +4,10 @@
package io.flutter.plugin.platform;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.view.AccessibilityBridge;
/**

6
shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
View File

@ -11,13 +11,13 @@ import android.content.ClipboardManager;
import android.content.Context;
import android.graphics.Rect;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.view.HapticFeedbackConstants;
import android.view.SoundEffectConstants;
import android.view.View;
import android.view.Window;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import io.flutter.embedding.engine.systemchannels.PlatformChannel;
import java.util.ArrayList;
import java.util.List;

2
shell/platform/android/io/flutter/plugin/platform/PlatformView.java
View File

@ -5,8 +5,8 @@
package io.flutter.plugin.platform;
import android.annotation.SuppressLint;
import android.support.annotation.NonNull;
import android.view.View;
import androidx.annotation.NonNull;
/** A handle to an Android view to be embedded in the Flutter hierarchy. */
public interface PlatformView {

6
shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
View File

@ -10,13 +10,13 @@ import static android.view.MotionEvent.PointerProperties;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.UiThread;
import android.support.annotation.VisibleForTesting;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.UiThread;
import androidx.annotation.VisibleForTesting;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.embedding.engine.systemchannels.PlatformViewsChannel;
import io.flutter.plugin.editing.TextInputPlugin;

6
shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
View File

@ -16,9 +16,6 @@ import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Keep;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Log;
import android.view.Display;
import android.view.Gravity;
@ -28,6 +25,9 @@ import android.view.WindowManager;
import android.view.accessibility.AccessibilityEvent;
import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

2
shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java
View File

@ -11,10 +11,10 @@ import android.content.Context;
import android.hardware.display.DisplayManager;
import android.hardware.display.VirtualDisplay;
import android.os.Build;
import android.support.annotation.NonNull;
import android.view.Surface;
import android.view.View;
import android.view.ViewTreeObserver;
import androidx.annotation.NonNull;
import io.flutter.view.TextureRegistry;
@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)

6
shell/platform/android/io/flutter/view/AccessibilityBridge.java
View File

@ -15,9 +15,6 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
@ -26,6 +23,9 @@ import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeProvider;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import io.flutter.BuildConfig;
import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
import io.flutter.plugin.platform.PlatformViewsAccessibilityDelegate;

6
shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java
View File

@ -9,9 +9,6 @@ import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
import android.support.annotation.Keep;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Log;
import android.util.SparseArray;
import android.view.MotionEvent;
@ -20,6 +17,9 @@ import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeProvider;
import android.view.accessibility.AccessibilityRecord;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

4
shell/platform/android/io/flutter/view/FlutterCallbackInformation.java
View File

@ -4,8 +4,8 @@
package io.flutter.view;
import android.support.annotation.Keep;
import android.support.annotation.NonNull;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import io.flutter.embedding.engine.FlutterJNI;
/**

6
shell/platform/android/io/flutter/view/FlutterMain.java
View File

@ -6,9 +6,9 @@ package io.flutter.view;
import android.content.Context;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import io.flutter.embedding.engine.loader.FlutterLoader;
/**

4
shell/platform/android/io/flutter/view/FlutterNativeView.java
View File

@ -6,9 +6,9 @@ package io.flutter.view;
import android.app.Activity;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.UiThread;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.UiThread;
import io.flutter.app.FlutterPluginRegistry;
import io.flutter.embedding.engine.FlutterEngine.EngineLifecycleListener;
import io.flutter.embedding.engine.FlutterJNI;

6
shell/platform/android/io/flutter/view/FlutterView.java
View File

@ -18,9 +18,6 @@ import android.graphics.SurfaceTexture;
import android.os.Build;
import android.os.Handler;
import android.os.LocaleList;
import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.annotation.UiThread;
import android.text.format.DateFormat;
import android.util.AttributeSet;
import android.util.Log;
@ -36,6 +33,9 @@ import android.view.accessibility.AccessibilityNodeProvider;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.annotation.UiThread;
import io.flutter.app.FlutterPluginRegistry;
import io.flutter.embedding.android.AndroidKeyProcessor;
import io.flutter.embedding.android.AndroidTouchProcessor;

2
shell/platform/android/io/flutter/view/VsyncWaiter.java
View File

@ -4,9 +4,9 @@
package io.flutter.view;
import android.support.annotation.NonNull;
import android.view.Choreographer;
import android.view.WindowManager;
import androidx.annotation.NonNull;
import io.flutter.embedding.engine.FlutterJNI;
// TODO(mattcarroll): add javadoc.

4
shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java
View File

@ -13,10 +13,10 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.Activity;
import android.arch.lifecycle.Lifecycle;
import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
import io.flutter.embedding.android.FlutterActivityAndFragmentDelegate.Host;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.FlutterEngineCache;

4
shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java
View File

@ -11,8 +11,8 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import io.flutter.embedding.android.FlutterActivityLaunchConfigs.BackgroundMode;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.FlutterJNI;

6
shell/platform/android/test/io/flutter/embedding/android/FlutterAndroidComponentTest.java
View File

@ -11,11 +11,11 @@ import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
import android.app.Activity;
import android.arch.lifecycle.Lifecycle;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Lifecycle;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.FlutterEngineCache;
import io.flutter.embedding.engine.FlutterJNI;

2
shell/platform/android/test/io/flutter/embedding/engine/FlutterEnginePluginRegistryTest.java
View File

@ -7,7 +7,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import io.flutter.embedding.engine.loader.FlutterLoader;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.plugin.platform.PlatformViewsController;

2
shell/platform/android/test/io/flutter/embedding/engine/PluginComponentTest.java
View File

@ -5,7 +5,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.FlutterJNI;
import io.flutter.embedding.engine.loader.FlutterLoader;

15
shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java
View File

@ -10,7 +10,7 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.content.ClipboardManager;
import android.content.res.AssetManager;
import android.text.Editable;
import android.text.InputType;
@ -28,7 +28,6 @@ import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowClipboardManager;
@Config(manifest = Config.NONE, sdk = 27, shadows = ShadowClipboardManager.class)
@ -71,8 +70,8 @@ public class InputConnectionAdaptorTest {
@Test
public void testPerformContextMenuAction_cut() {
ShadowClipboardManager clipboardManager =
Shadow.extract(RuntimeEnvironment.application.getSystemService(Context.CLIPBOARD_SERVICE));
ClipboardManager clipboardManager =
RuntimeEnvironment.application.getSystemService(ClipboardManager.class);
int selStart = 6;
int selEnd = 11;
Editable editable = sampleEditable(selStart, selEnd);
@ -89,8 +88,8 @@ public class InputConnectionAdaptorTest {
@Test
public void testPerformContextMenuAction_copy() {
ShadowClipboardManager clipboardManager =
Shadow.extract(RuntimeEnvironment.application.getSystemService(Context.CLIPBOARD_SERVICE));
ClipboardManager clipboardManager =
RuntimeEnvironment.application.getSystemService(ClipboardManager.class);
int selStart = 6;
int selEnd = 11;
Editable editable = sampleEditable(selStart, selEnd);
@ -109,8 +108,8 @@ public class InputConnectionAdaptorTest {
@Test
public void testPerformContextMenuAction_paste() {
ShadowClipboardManager clipboardManager =
Shadow.extract(RuntimeEnvironment.application.getSystemService(Context.CLIPBOARD_SERVICE));
ClipboardManager clipboardManager =
RuntimeEnvironment.application.getSystemService(ClipboardManager.class);
String textToBePasted = "deadbeef";
clipboardManager.setText(textToBePasted);
Editable editable = sampleEditable(0, 0);

2
shell/platform/android/test/io/flutter/plugins/GeneratedPluginRegistrant.java
View File

@ -1,6 +1,6 @@
package io.flutter.plugins;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import io.flutter.embedding.engine.FlutterEngine;
import java.util.ArrayList;
import java.util.List;

6
testing/run_tests.py
View File

@ -290,10 +290,10 @@ def RunJavaTests(filter, android_variant='android_debug_unopt'):
android_out_dir = os.path.join(out_dir, android_variant)
EnsureJavaTestsAreBuilt(android_out_dir)
robolectric_dir = os.path.join(buildroot_dir, 'third_party', 'robolectric', 'lib')
embedding_deps_dir = os.path.join(buildroot_dir, 'third_party', 'android_embedding_dependencies', 'lib')
classpath = map(str, [
os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-29', 'android.jar'),
os.path.join(robolectric_dir, '*'), # Wildcard for all jars in the directory
os.path.join(embedding_deps_dir, '*'), # Wildcard for all jars in the directory
os.path.join(android_out_dir, 'flutter.jar'),
os.path.join(android_out_dir, 'robolectric_tests.jar')
])
@ -302,7 +302,7 @@ def RunJavaTests(filter, android_variant='android_debug_unopt'):
command = [
'java',
'-Drobolectric.offline=true',
'-Drobolectric.dependency.dir=' + robolectric_dir,
'-Drobolectric.dependency.dir=' + embedding_deps_dir,
'-classpath', ':'.join(classpath),
'-Drobolectric.logging=stdout',
'org.junit.runner.JUnitCore',

16
testing/scenario_app/android/app/build.gradle
View File

@ -12,7 +12,7 @@ android {
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@ -24,12 +24,12 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:design:28.0.0'
implementation 'android.arch.lifecycle:common-java8:1.1.1'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}

6
testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java
View File

@ -7,9 +7,9 @@ package dev.flutter.scenarios;
import static org.junit.Assert.fail;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.internal.runner.junit4.statement.UiThreadStatement;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.InstrumentationRegistry;
import androidx.test.internal.runner.junit4.statement.UiThreadStatement;
import androidx.test.runner.AndroidJUnit4;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.dart.DartExecutor;
import java.util.concurrent.CompletableFuture;

4
testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/ExampleInstrumentedTest.java
View File

@ -3,8 +3,8 @@ package dev.flutter.scenarios;
import static org.junit.Assert.*;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;

2
testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/BlankActivity.java
View File

@ -1,7 +1,7 @@
package dev.flutter.scenarios;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
public class BlankActivity extends AppCompatActivity {
@Override

2
testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TextPlatformViewActivity.java
View File

@ -8,7 +8,7 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import io.flutter.Log;
import io.flutter.embedding.android.FlutterActivity;
import io.flutter.embedding.engine.FlutterEngine;

2
testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TextPlatformViewFactory.java
View File

@ -5,7 +5,7 @@
package dev.flutter.scenarios;
import android.content.Context;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import io.flutter.plugin.common.MessageCodec;
import io.flutter.plugin.common.StringCodec;
import io.flutter.plugin.platform.PlatformView;

Some files were not shown because too many files have changed in this diff Show More