diff options
| -rw-r--r-- | Android.bp | 53 | ||||
| -rw-r--r-- | AndroidManifest-app.xml | 6 | ||||
| -rw-r--r-- | NOTICE | 202 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | aconfig/Android.bp | 31 | ||||
| -rw-r--r-- | aconfig/FeatureFlags.aconfig | 12 | ||||
| -rw-r--r-- | aconfig/README.md | 20 | ||||
| -rw-r--r-- | java/tests/Android.bp | 36 | ||||
| -rw-r--r-- | java/tests/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | java/tests/README.md | 7 |
10 files changed, 134 insertions, 244 deletions
@@ -1,5 +1,5 @@ // -// Copyright (C) 2021 The Android Open Source Project +// Copyright (C) 2023 The Android Open Source Project // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,20 +15,8 @@ // package { - // See: http://go/android-license-faq - // This was chosen for Sharesheet to match existing packages. - default_applicable_licenses: ["packages_modules_IntentResolver_license"], -} - -license { - name: "packages_modules_IntentResolver_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], + default_applicable_licenses: ["Android-Apache-2.0"], + default_visibility: [":__subpackages__"], } filegroup { @@ -45,9 +33,8 @@ filegroup { ], } -android_library { - name: "IntentResolver-core", - min_sdk_version: "current", +java_defaults { + name: "Java_Defaults", srcs: [ "java/src/**/*.java", "java/src/**/*.kt", @@ -62,9 +49,16 @@ android_library { resource_dirs: [ "java/res", ], - manifest: "AndroidManifest-lib.xml", + min_sdk_version: "current", + lint: { + strict_updatability_linting: false, + }, +} +android_library { + name: "IntentResolver-core", + defaults: ["Java_Defaults"], static_libs: [ "androidx.annotation_annotation", "androidx.concurrent_concurrent-futures", @@ -75,6 +69,7 @@ android_library { "androidx.lifecycle_lifecycle-extensions", "androidx.lifecycle_lifecycle-runtime-ktx", "androidx.lifecycle_lifecycle-viewmodel-ktx", + "IntentResolverFlagsLib", "kotlin-stdlib", "kotlinx_coroutines", "kotlinx-coroutines-android", @@ -82,33 +77,33 @@ android_library { "guava", "SystemUIFlagsLib", ], - - lint: { - strict_updatability_linting: false, - }, - optimize: { proguard_flags_files: ["proguard.flags"], }, } -android_app { - name: "IntentResolver", +java_defaults { + name: "App_Defaults", + manifest: "AndroidManifest-app.xml", min_sdk_version: "current", + platform_apis: true, certificate: "platform", privileged: true, - manifest: "AndroidManifest-app.xml", required: [ "privapp_whitelist_com.android.intentresolver", ], - srcs: ["src/**/*.java"], - platform_apis: true, +} + +android_app { + name: "IntentResolver", + defaults: ["App_Defaults"], static_libs: [ "IntentResolver-core", ], optimize: { enabled: true, }, + visibility: ["//visibility:public"], apex_available: [ "//apex_available:platform", "com.android.intentresolver", diff --git a/AndroidManifest-app.xml b/AndroidManifest-app.xml index 57ea497b..826d8a5a 100644 --- a/AndroidManifest-app.xml +++ b/AndroidManifest-app.xml @@ -17,6 +17,7 @@ */ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" package="com.android.intentresolver" android:versionCode="0" android:versionName="2021-11" @@ -58,6 +59,11 @@ android:visibleToInstantApps="true" android:exported="false"/> + <provider android:name="androidx.startup.InitializationProvider" + android:authorities="${applicationId}.androidx-startup" + tools:replace="android:authorities" + tools:node="remove" /> + </application> </manifest> diff --git a/NOTICE b/NOTICE deleted file mode 100644 index d6456956..00000000 --- a/NOTICE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md new file mode 100644 index 00000000..192f5ca1 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +# IntentResolver + +## About + +`IntentResolver` provides the implementation for Intent +[ACTION_CHOOSER](https://developer.android.com/reference/android/content/Intent#ACTION_CHOOSER) + +See also: [ShareCompat.IntentBuilder](https://developer.android.com/reference/androidx/core/app/ShareCompat.IntentBuilder) diff --git a/aconfig/Android.bp b/aconfig/Android.bp new file mode 100644 index 00000000..5f6a91fe --- /dev/null +++ b/aconfig/Android.bp @@ -0,0 +1,31 @@ +// +// Copyright (C) 2023 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +aconfig_declarations { + name: "IntentResolverFlags", + package: "com.android.intentresolver", + srcs: ["FeatureFlags.aconfig"], +} + +java_aconfig_library { + name: "IntentResolverFlagsLib", + aconfig_declarations: "IntentResolverFlags", + test: false +} diff --git a/aconfig/FeatureFlags.aconfig b/aconfig/FeatureFlags.aconfig new file mode 100644 index 00000000..037a3b9a --- /dev/null +++ b/aconfig/FeatureFlags.aconfig @@ -0,0 +1,12 @@ +package: "com.android.intentresolver" + +# name: [a-z0-9][_a-z0-9]+ +# namespace: intentresolver +# bug: "Feature_Bug_#" or "<none>" + +flag { + name: "example_new_sharing_method" + namespace: "intentresolver" + description: "Enables the example new sharing mechanism." + bug: "<none>" +} diff --git a/aconfig/README.md b/aconfig/README.md new file mode 100644 index 00000000..87a6651c --- /dev/null +++ b/aconfig/README.md @@ -0,0 +1,20 @@ +# AConfig Flag libraries + +Generated java flag libraries. + +### FeatureFlagsLib + +__Flags__ +* Static singleton provider for FeatureFlags impl +* Overridable with setFeatureFlags/unsetFeatureFlags + +* __FeatureFlags__ +* The generated flags interface, one boolean function per flag + +__FeatureFlagsImpl__ +* For production code +* Real implementation using DeviceConfig + +__FakeFeatureFlagsImpl__ +* a configurable stateful fake (get/set/clear) +* Use with Dagger to inject across multiple components for integration tests diff --git a/java/tests/Android.bp b/java/tests/Android.bp index 29ecd95d..e4d24eb5 100644 --- a/java/tests/Android.bp +++ b/java/tests/Android.bp @@ -1,11 +1,26 @@ +// +// Copyright (C) 2023 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + package { - // See: http://go/android-license-faq - default_applicable_licenses: ["packages_modules_IntentResolver_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } android_test { name: "IntentResolverUnitTests", - + manifest: "AndroidManifest.xml", // Include all test java files. srcs: ["src/**/*.java", "src/**/*.kt"], @@ -17,10 +32,10 @@ android_test { "framework-res", ], + resource_dirs: ["res"], + test_config: "AndroidTest.xml", static_libs: [ - "IntentResolver-core", "androidx.test.core", - "androidx.test.rules", "androidx.test.ext.junit", "androidx.test.ext.truth", "androidx.test.espresso.contrib", @@ -28,19 +43,18 @@ android_test { "androidx.test.rules", "androidx.lifecycle_lifecycle-common-java8", "androidx.lifecycle_lifecycle-extensions", - "androidx.lifecycle_lifecycle-runtime-ktx", "androidx.lifecycle_lifecycle-runtime-testing", + "IntentResolver-core", + "junit", "kotlinx_coroutines_test", "mockito-target-minus-junit4", "testables", "truth-prebuilt", ], - min_sdk_version: "current", - target_sdk_version: "current", plugins: ["dagger2-compiler"], test_suites: ["general-tests"], sdk_version: "core_platform", - compile_multilib: "both", - - dont_merge_manifests: true, + min_sdk_version: "current", + target_sdk_version: "current", + platform_apis: true, } diff --git a/java/tests/AndroidManifest.xml b/java/tests/AndroidManifest.xml index 4517a60c..ae6a2205 100644 --- a/java/tests/AndroidManifest.xml +++ b/java/tests/AndroidManifest.xml @@ -34,8 +34,7 @@ </application> <instrumentation android:name="android.testing.TestableInstrumentation" - android:targetPackage="com.android.intentresolver.tests" - android:label="Tests for IntentResolver"> + android:targetPackage="com.android.intentresolver.tests"> </instrumentation> </manifest> diff --git a/java/tests/README.md b/java/tests/README.md new file mode 100644 index 00000000..b42e8d27 --- /dev/null +++ b/java/tests/README.md @@ -0,0 +1,7 @@ + +__ABOUT__ + +This is package is configured as a self-instrumenting test APK. The IntentResolver application code +is bundled in and the instrumentation APK targets itself. This is used for in-process mocking and +verification involving live components that many tests rely on. + |