diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5c3509f1..b169638b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,10 @@ # How to Contribute -We'd love to accept your patches and contributions to the source code included -in this project. There are just a few small guidelines you need to follow. +Please use the [issue tracker](https://github.com/google-ar/sceneform-android-sdk/issues) +to report any issue as we do not accept pull requests for this repository. + +If you'd like to send us a patch or pull request, there are just a few small +guidelines you need to follow. ## Contributor License Agreement @@ -15,15 +18,7 @@ You generally only need to submit a CLA once, so if you've already submitted one (even if it was for a different project), you probably don't need to do it again. -## Code reviews - -Although we do not use the normal GitHub pull request process to incorporate -contributions, it's okay to send us pull requests. Once we have received your -CLA we will review and consider your contribution for inclusion in a future -release of the SDK. - ## Community Guidelines -This project follows -[Google's Open Source Community +This project follows [Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). diff --git a/README.md b/README.md index 2d6734dc..11d24455 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,11 @@ The SDK release notes are available on the [releases](//github.com/google-ar/sce By downloading the Sceneform SDK for Android, you agree that the [Google APIs Terms of Service](//developers.google.com/terms/) governs your use thereof. -## User privacy requirements -You must disclose the use of Google Play Services for AR (ARCore) and how it collects and processes data, prominently in your application, easily accessible to users. You can do this by adding the following text on your main menu or notice screen: "This application runs on [Google Play Services for AR](//play.google.com/store/apps/details?id=com.google.ar.core) (ARCore), which is provided by Google LLC and governed by the [Google Privacy Policy](//policies.google.com/privacy)" +## User privacy requirements + +You must disclose the use of Google Play Services for AR (ARCore) and how it +collects and processes data, prominently in your application, easily accessible +to users. You can do this by adding the following text on your main menu or +notice screen: "This application runs on [Google Play Services for AR](//play.google.com/store/apps/details?id=com.google.ar.core) (ARCore), +which is provided by Google LLC and governed by the [Google Privacy Policy](//policies.google.com/privacy)". diff --git a/assets/canonical_face_texture.psd b/assets/canonical_face_texture.psd new file mode 100644 index 00000000..63927427 Binary files /dev/null and b/assets/canonical_face_texture.psd differ diff --git a/samples/animation/app/build.gradle b/samples/animation/app/build.gradle index a0ac9917..59fd29c9 100644 --- a/samples/animation/app/build.gradle +++ b/samples/animation/app/build.gradle @@ -26,8 +26,8 @@ dependencies { implementation 'com.android.support.constraint:constraint-layout:1.1.3' // Sceneform - implementation "com.google.ar.sceneform.ux:sceneform-ux:1.11.0" - implementation "com.google.ar.sceneform:animation:1.11.0" + implementation "com.google.ar.sceneform.ux:sceneform-ux:1.12.0" + implementation "com.google.ar.sceneform:animation:1.12.0" implementation 'com.android.support:design:28.0.0' } diff --git a/samples/animation/build.gradle b/samples/animation/build.gradle index f2927d18..de16f202 100644 --- a/samples/animation/build.gradle +++ b/samples/animation/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.4.1' - classpath 'com.google.ar.sceneform:plugin:1.11.0' + classpath 'com.google.ar.sceneform:plugin:1.12.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/augmentedfaces/app/build.gradle b/samples/augmentedfaces/app/build.gradle index 394f1a2f..b4d117ee 100644 --- a/samples/augmentedfaces/app/build.gradle +++ b/samples/augmentedfaces/app/build.gradle @@ -42,13 +42,13 @@ android { dependencies { // Provides ArFragment, and other Sceneform UX resources: - implementation "com.google.ar.sceneform.ux:sceneform-ux:1.11.0" + implementation "com.google.ar.sceneform.ux:sceneform-ux:1.12.0" // Use the Sceneform UX Package built from the source files included in the sceneformux folder. //api project(":sceneformux") // Alternatively, use ArSceneView without the UX dependency. - //implementation "com.google.ar.sceneform:core:1.11.0" + //implementation "com.google.ar.sceneform:core:1.12.0" implementation "com.android.support:appcompat-v7:28.0.0" } diff --git a/samples/augmentedfaces/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/samples/augmentedfaces/app/src/main/res/drawable-xxhdpi/ic_launcher.png index 3f691da0..429d80f4 100644 Binary files a/samples/augmentedfaces/app/src/main/res/drawable-xxhdpi/ic_launcher.png and b/samples/augmentedfaces/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/samples/augmentedfaces/build.gradle b/samples/augmentedfaces/build.gradle index f2927d18..de16f202 100644 --- a/samples/augmentedfaces/build.gradle +++ b/samples/augmentedfaces/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.4.1' - classpath 'com.google.ar.sceneform:plugin:1.11.0' + classpath 'com.google.ar.sceneform:plugin:1.12.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/augmentedimage/app/build.gradle b/samples/augmentedimage/app/build.gradle index ee678e84..9de408e8 100644 --- a/samples/augmentedimage/app/build.gradle +++ b/samples/augmentedimage/app/build.gradle @@ -48,7 +48,7 @@ dependencies { implementation 'com.android.support:design:28.0.0' // Use the Sceneform UX Package pre-built from Maven. - implementation "com.google.ar.sceneform.ux:sceneform-ux:1.11.0" + implementation "com.google.ar.sceneform.ux:sceneform-ux:1.12.0" // Use the Sceneform UX Package built from the source files included in the sceneformux folder. //api project(":sceneformux") diff --git a/samples/augmentedimage/build.gradle b/samples/augmentedimage/build.gradle index f2927d18..de16f202 100644 --- a/samples/augmentedimage/build.gradle +++ b/samples/augmentedimage/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.4.1' - classpath 'com.google.ar.sceneform:plugin:1.11.0' + classpath 'com.google.ar.sceneform:plugin:1.12.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/chromakeyvideo/app/build.gradle b/samples/chromakeyvideo/app/build.gradle index 02ff97ec..79ae1b4d 100644 --- a/samples/chromakeyvideo/app/build.gradle +++ b/samples/chromakeyvideo/app/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation "com.android.support:design:28.0.0" // Use the Sceneform UX Package pre-built from Maven. - implementation "com.google.ar.sceneform.ux:sceneform-ux:1.11.0" + implementation "com.google.ar.sceneform.ux:sceneform-ux:1.12.0" // Use the Sceneform UX Package built from the source files included in the sceneformux folder. //api project(":sceneformux") diff --git a/samples/chromakeyvideo/build.gradle b/samples/chromakeyvideo/build.gradle index f2927d18..de16f202 100644 --- a/samples/chromakeyvideo/build.gradle +++ b/samples/chromakeyvideo/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.4.1' - classpath 'com.google.ar.sceneform:plugin:1.11.0' + classpath 'com.google.ar.sceneform:plugin:1.12.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/hellosceneform/app/build.gradle b/samples/hellosceneform/app/build.gradle index 79ba5c99..d24e33b5 100644 --- a/samples/hellosceneform/app/build.gradle +++ b/samples/hellosceneform/app/build.gradle @@ -42,13 +42,13 @@ android { dependencies { // Provides ArFragment, and other Sceneform UX resources: - implementation "com.google.ar.sceneform.ux:sceneform-ux:1.11.0" + implementation "com.google.ar.sceneform.ux:sceneform-ux:1.12.0" // Use the Sceneform UX Package built from the source files included in the sceneformux folder. //api project(":sceneformux") // Alternatively, use ArSceneView without the UX dependency. - //implementation "com.google.ar.sceneform:core:1.11.0" + //implementation "com.google.ar.sceneform:core:1.12.0" implementation "com.android.support:appcompat-v7:28.0.0" } diff --git a/samples/hellosceneform/build.gradle b/samples/hellosceneform/build.gradle index f2927d18..de16f202 100644 --- a/samples/hellosceneform/build.gradle +++ b/samples/hellosceneform/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.4.1' - classpath 'com.google.ar.sceneform:plugin:1.11.0' + classpath 'com.google.ar.sceneform:plugin:1.12.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/solarsystem/app/build.gradle b/samples/solarsystem/app/build.gradle index 45ac6287..810b3fd1 100644 --- a/samples/solarsystem/app/build.gradle +++ b/samples/solarsystem/app/build.gradle @@ -40,7 +40,7 @@ android { } dependencies { - implementation "com.google.ar.sceneform:core:1.11.0" + implementation "com.google.ar.sceneform:core:1.12.0" implementation "com.android.support:appcompat-v7:28.0.0" implementation "com.android.support:design:28.0.0" } diff --git a/samples/solarsystem/build.gradle b/samples/solarsystem/build.gradle index f2927d18..de16f202 100644 --- a/samples/solarsystem/build.gradle +++ b/samples/solarsystem/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.4.1' - classpath 'com.google.ar.sceneform:plugin:1.11.0' + classpath 'com.google.ar.sceneform:plugin:1.12.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/videorecording/app/build.gradle b/samples/videorecording/app/build.gradle index c3e356a3..94de4c68 100644 --- a/samples/videorecording/app/build.gradle +++ b/samples/videorecording/app/build.gradle @@ -42,14 +42,14 @@ android { dependencies { // Provides ArFragment, and other Sceneform UX resources: - implementation "com.google.ar.sceneform.ux:sceneform-ux:1.11.0" + implementation "com.google.ar.sceneform.ux:sceneform-ux:1.12.0" // Use the Sceneform UX Package built from the source files included in the sceneformux folder. //api project(":sceneformux") // Alternatively, use ArSceneView without the UX dependency. - //implementation "com.google.ar.sceneform:core:1.11.0" + //implementation "com.google.ar.sceneform:core:1.12.0" implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support:design:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' diff --git a/samples/videorecording/build.gradle b/samples/videorecording/build.gradle index f2927d18..de16f202 100644 --- a/samples/videorecording/build.gradle +++ b/samples/videorecording/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.4.1' - classpath 'com.google.ar.sceneform:plugin:1.11.0' + classpath 'com.google.ar.sceneform:plugin:1.12.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/sceneformux/build.gradle b/sceneformux/build.gradle index f2927d18..de16f202 100644 --- a/sceneformux/build.gradle +++ b/sceneformux/build.gradle @@ -23,7 +23,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.4.1' - classpath 'com.google.ar.sceneform:plugin:1.11.0' + classpath 'com.google.ar.sceneform:plugin:1.12.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/sceneformux/ux/build.gradle b/sceneformux/ux/build.gradle index d10c1489..c040898c 100644 --- a/sceneformux/ux/build.gradle +++ b/sceneformux/ux/build.gradle @@ -39,7 +39,7 @@ android { } dependencies { - api "com.google.ar.sceneform:core:1.11.0" + api "com.google.ar.sceneform:core:1.12.0" implementation "com.android.support:appcompat-v7:28.0.0" implementation "com.android.support:design:28.0.0" }