Allow License https://developer.android.com/studio/terms.html

google · Jan 18, 2024 · 26fa19d · 26fa19d
1 parent c4a2ce5
commit 26fa19d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/buildSrc/src/main/kotlin/LicenseeConfig.kt b/buildSrc/src/main/kotlin/LicenseeConfig.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,13 +116,15 @@ fun Project.configureLicensee() {
     // https://developers.google.com/android/reference/com/google/android/gms/common/package-summary
     allowDependency("com.google.android.gms", "play-services-base", "17.4.0") { because("") }
     allowDependency("com.google.android.gms", "play-services-base", "18.0.1") { because("") }
+    allowDependency("com.google.android.gms", "play-services-base", "18.1.0") { because("") }
 
     allowDependency("com.google.android.odml", "image", "1.0.0-beta1") { because("") }
 
     // More utility classes
     // https://developers.google.com/android/reference/com/google/android/gms/common/package-summary
     allowDependency("com.google.android.gms", "play-services-basement", "17.4.0") { because("") }
     allowDependency("com.google.android.gms", "play-services-basement", "18.0.0") { because("") }
+    allowDependency("com.google.android.gms", "play-services-basement", "18.1.0") { because("") }
 
     // https://developers.google.com/android/reference/com/google/android/gms/common/package-summary
     allowDependency("com.google.android.gms", "play-services-clearcut", "17.0.0") { because("") }
@@ -138,6 +140,7 @@ fun Project.configureLicensee() {
     // Tasks API Android https://developers.google.com/android/guides/tasks
     allowDependency("com.google.android.gms", "play-services-tasks", "17.2.0") { because("") }
     allowDependency("com.google.android.gms", "play-services-tasks", "18.0.1") { because("") }
+    allowDependency("com.google.android.gms", "play-services-tasks", "18.0.2") { because("") }
 
     // Barcode Scanning https://developers.google.com/ml-kit/vision/barcode-scanning
     allowDependency("com.google.mlkit", "barcode-scanning", "16.1.1") { because("") }
@@ -201,4 +204,5 @@ private val nonStandardLicenseUrls =
     "http://opensource.org/licenses/BSD-3-Clause",
     "http://www.opensource.org/licenses/bsd-license.php",
     "https://asm.ow2.io/license.html",
+    "https://developer.android.com/studio/terms.html",
   )
diff --git a/catalog/src/main/assets/component_location_widget.json b/catalog/src/main/assets/component_location_widget.json
@@ -3,25 +3,6 @@
   "language": "en",
   "status": "active",
   "date": "2020-11-18T07:24:47.111Z",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext",
-      "extension": [
-        {
-          "url": "name",
-          "valueCoding": {
-            "system": "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext",
-            "code": "client",
-            "display": "Client as a Patient"
-          }
-        },
-        {
-          "url": "type",
-          "valueCode": "Patient"
-        }
-      ]
-    }
-  ],
   "item": [
     {
       "linkId": "location-widget",

diff --git a/.../android/fhir/datacapture/contrib/views/locationwidget/LocationWidgetViewHolderFactory.kt b/.../android/fhir/datacapture/contrib/views/locationwidget/LocationWidgetViewHolderFactory.kt
@@ -17,7 +17,6 @@
 package com.google.android.fhir.datacapture.contrib.views.locationwidget
 
 import android.view.View
-import android.widget.Toast
 import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.extensions.uiControlControlCode
 import com.google.android.fhir.datacapture.views.GroupHeaderView
@@ -47,7 +46,6 @@ object LocationWidgetViewHolderFactory :
           locationWidgetButton.setOnClickListener {
             CurrentLocationDialogFragment()
               .show(supportFragmentManager, CurrentLocationDialogFragment::class.java.simpleName)
-            Toast.makeText(it.context, "Load Locations!!!", Toast.LENGTH_LONG).show()
           }
         }
       }