Move all Built-in Types in capabilities-core under an experimental package
AndroidX does not allow two symbols in the repo to have the same name which is breaking presubmits when we try to check-in the actual Built-in Types in https://android-review.git.corp.google.com/c/platform/frameworks/support/+/2534118.
This CL moves all symbols within `androidx.appactions.builtintypes` one package down into `androidx.appactions.builtintypes.experimental` to avoid the name collisions.
Relnote: Move symbols under androidx.appactions.builtintypes to androidx.appactions.builtintypes.experimental
Test: Import statements updated. Project still compiles.
Change-Id: Iae4d95610bea9314303eb585b085fe3049a075ba
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Attendee.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Attendee.kt
similarity index 86%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Attendee.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Attendee.kt
index 6934635..d4234c3 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Attendee.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Attendee.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.properties
+package androidx.appactions.builtintypes.experimental.properties
-import androidx.appactions.builtintypes.types.Person
+import androidx.appactions.builtintypes.experimental.types.Person
/**
* Represents the value of the union property: http://schema.org/attendee, currently it only can
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/CallFormat.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/CallFormat.kt
new file mode 100644
index 0000000..a2ad59b
--- /dev/null
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/CallFormat.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 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 androidx.appactions.builtintypes.experimental.properties
+
+class CallFormat private constructor(
+ val asText: String?,
+ val asCanonicalValue: CanonicalValue?,
+) {
+
+ constructor(text: String) : this(asText = text, asCanonicalValue = null)
+
+ constructor(canonicalValue: CanonicalValue) : this(
+ asText = null,
+ asCanonicalValue = canonicalValue
+ )
+
+ abstract class CanonicalValue internal constructor(val textValue: String)
+}
\ No newline at end of file
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/EndDate.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/EndDate.kt
similarity index 91%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/EndDate.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/EndDate.kt
index 186b31c..ea9c33a 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/EndDate.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/EndDate.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.properties
+package androidx.appactions.builtintypes.experimental.properties
import java.time.LocalDate
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/ItemListElement.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/ItemListElement.kt
similarity index 84%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/ItemListElement.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/ItemListElement.kt
index 3be1e5f..395c1bf 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/ItemListElement.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/ItemListElement.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.properties
+package androidx.appactions.builtintypes.experimental.properties
-import androidx.appactions.builtintypes.types.ListItem
+import androidx.appactions.builtintypes.experimental.types.ListItem
class ItemListElement(asListItem: ListItem) {
@get:JvmName("asListItem")
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Name.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Name.kt
similarity index 91%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Name.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Name.kt
index 1bef0a2..7327971 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Name.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Name.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.properties
+package androidx.appactions.builtintypes.experimental.properties
class Name(asText: String) {
@get:JvmName("asText")
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Participant.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Participant.kt
similarity index 86%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Participant.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Participant.kt
index f044bbf..b84d253 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Participant.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Participant.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.properties
+package androidx.appactions.builtintypes.experimental.properties
-import androidx.appactions.builtintypes.types.Person
+import androidx.appactions.builtintypes.experimental.types.Person
/**
* Represents the value of the union property: http://schema.org/participant, currently it only can
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Recipient.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Recipient.kt
similarity index 86%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Recipient.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Recipient.kt
index 186878a..d5a9a01 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Recipient.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Recipient.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.properties
+package androidx.appactions.builtintypes.experimental.properties
-import androidx.appactions.builtintypes.types.Person
+import androidx.appactions.builtintypes.experimental.types.Person
/**
* Represents the value of the union property: http://schema.org/recipient, currently it only can
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/StartDate.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/StartDate.kt
similarity index 91%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/StartDate.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/StartDate.kt
index 8b94d93..96d54eae 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/StartDate.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/StartDate.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.properties
+package androidx.appactions.builtintypes.experimental.properties
import java.time.LocalDate
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Text.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Text.kt
similarity index 91%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Text.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Text.kt
index 4b1e628..371954a 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/Text.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/properties/Text.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.properties
+package androidx.appactions.builtintypes.experimental.properties
class Text(asText: String) {
@get:JvmName("asText")
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ActionAlreadyInProgress.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ActionAlreadyInProgress.kt
similarity index 93%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ActionAlreadyInProgress.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ActionAlreadyInProgress.kt
index 88279c8..c3d868c 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ActionAlreadyInProgress.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ActionAlreadyInProgress.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
interface ActionAlreadyInProgress : Thing {
override fun toBuilder(): Builder<*>
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ActionNotInProgress.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ActionNotInProgress.kt
similarity index 93%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ActionNotInProgress.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ActionNotInProgress.kt
index e5eee22d..90bf9a9 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ActionNotInProgress.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ActionNotInProgress.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
interface ActionNotInProgress : Thing {
override fun toBuilder(): Builder<*>
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Alarm.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Alarm.kt
similarity index 92%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Alarm.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Alarm.kt
index 5afb6b6..d968db2a1 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Alarm.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Alarm.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
interface Alarm : Thing {
override fun toBuilder(): Builder<*>
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/CalendarEvent.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/CalendarEvent.kt
similarity index 90%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/CalendarEvent.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/CalendarEvent.kt
index 858de50..8545b7f 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/CalendarEvent.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/CalendarEvent.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
// TODO(b/271634410): Update Attendee references
-import androidx.appactions.builtintypes.properties.EndDate
-import androidx.appactions.builtintypes.properties.Name
-import androidx.appactions.builtintypes.properties.StartDate
-import androidx.appactions.builtintypes.properties.Attendee
+import androidx.appactions.builtintypes.experimental.properties.EndDate
+import androidx.appactions.builtintypes.experimental.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.StartDate
+import androidx.appactions.builtintypes.experimental.properties.Attendee
import java.time.LocalDate
interface CalendarEvent : Thing {
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Call.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Call.kt
similarity index 89%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Call.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Call.kt
index 2567dea..2f0fd0d 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Call.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Call.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.CallFormat
-import androidx.appactions.builtintypes.properties.Name
-import androidx.appactions.builtintypes.properties.Participant
+import androidx.appactions.builtintypes.experimental.properties.CallFormat
+import androidx.appactions.builtintypes.experimental.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Participant
interface Call : Thing {
val callFormat: CallFormat?
@@ -32,7 +32,8 @@
object CanonicalValue {
class CallFormat private constructor(textValue: String) :
- androidx.appactions.builtintypes.properties.CallFormat.CanonicalValue(textValue) {
+ androidx.appactions.builtintypes.experimental.properties.CallFormat
+ .CanonicalValue(textValue) {
companion object {
@JvmField
val Audio = CallFormat("Audio")
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/CreativeWork.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/CreativeWork.kt
similarity index 91%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/CreativeWork.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/CreativeWork.kt
index 3d340ea..136efdd 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/CreativeWork.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/CreativeWork.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
-import androidx.appactions.builtintypes.properties.Text
+import androidx.appactions.builtintypes.experimental.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Text
interface CreativeWork : Thing {
val text: Text?
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/GenericErrorStatus.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/GenericErrorStatus.kt
similarity index 93%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/GenericErrorStatus.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/GenericErrorStatus.kt
index 236cf9e..ec5d954 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/GenericErrorStatus.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/GenericErrorStatus.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
interface GenericErrorStatus : Thing {
override fun toBuilder(): Builder<*>
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ItemList.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ItemList.kt
similarity index 92%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ItemList.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ItemList.kt
index ff70802..4d5eecd 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ItemList.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ItemList.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
-import androidx.appactions.builtintypes.properties.ItemListElement
+import androidx.appactions.builtintypes.experimental.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.ItemListElement
interface ItemList : Thing {
val itemListElements: List<ItemListElement>
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ListItem.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ListItem.kt
similarity index 92%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ListItem.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ListItem.kt
index bff0c25..4c199e0 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/ListItem.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/ListItem.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
interface ListItem : Thing {
override fun toBuilder(): Builder<*>
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Message.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Message.kt
similarity index 90%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Message.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Message.kt
index f5d044d..0ebf75d 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Message.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Message.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
-import androidx.appactions.builtintypes.properties.Recipient
-import androidx.appactions.builtintypes.properties.Text
+import androidx.appactions.builtintypes.experimental.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Recipient
+import androidx.appactions.builtintypes.experimental.properties.Text
interface Message : Thing, CreativeWork {
val recipientList: List<Recipient>
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/NoInternetConnection.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/NoInternetConnection.kt
similarity index 93%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/NoInternetConnection.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/NoInternetConnection.kt
index bd890cc..b9ee7d7 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/NoInternetConnection.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/NoInternetConnection.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
interface NoInternetConnection : Thing {
override fun toBuilder(): Builder<*>
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Person.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Person.kt
similarity index 94%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Person.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Person.kt
index 3e1105e..6e92203 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Person.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Person.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
interface Person : Thing {
val email: String?
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/SafetyCheck.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/SafetyCheck.kt
similarity index 94%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/SafetyCheck.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/SafetyCheck.kt
index 61c9d61..7117296 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/SafetyCheck.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/SafetyCheck.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
import java.time.Duration
import java.time.ZonedDateTime
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/SuccessStatus.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/SuccessStatus.kt
similarity index 93%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/SuccessStatus.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/SuccessStatus.kt
index 834eba0..be0e15b 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/SuccessStatus.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/SuccessStatus.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
interface SuccessStatus : Thing {
override fun toBuilder(): Builder<*>
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Thing.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Thing.kt
similarity index 93%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Thing.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Thing.kt
index d9f957a..ecdd7e8 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Thing.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Thing.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
interface Thing {
val identifier: String?
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Timer.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Timer.kt
similarity index 92%
rename from appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Timer.kt
rename to appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Timer.kt
index 5a25e18..afe2dba 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/types/Timer.kt
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/experimental/types/Timer.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.appactions.builtintypes.types
+package androidx.appactions.builtintypes.experimental.types
-import androidx.appactions.builtintypes.properties.Name
+import androidx.appactions.builtintypes.experimental.properties.Name
interface Timer : Thing {
override fun toBuilder(): Builder<*>
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/CallFormat.kt b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/CallFormat.kt
deleted file mode 100644
index e1b072d..0000000
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/builtintypes/properties/CallFormat.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-package androidx.appactions.builtintypes.properties
-
-class CallFormat private constructor(
- val asText: String?,
- val asCanonicalValue: CanonicalValue?,
-) {
-
- constructor(text: String) : this(asText = text, asCanonicalValue = null)
-
- constructor(canonicalValue: CanonicalValue) : this(
- asText = null,
- asCanonicalValue = canonicalValue
- )
-
- abstract class CanonicalValue internal constructor(val textValue: String)
-}
\ No newline at end of file
diff --git a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/interaction/capabilities/core/impl/converters/TypeSpecBuilder.java b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/interaction/capabilities/core/impl/converters/TypeSpecBuilder.java
index 995efc3..7b03d72 100644
--- a/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/interaction/capabilities/core/impl/converters/TypeSpecBuilder.java
+++ b/appactions/interaction/interaction-capabilities-core/src/main/java/androidx/appactions/interaction/capabilities/core/impl/converters/TypeSpecBuilder.java
@@ -116,8 +116,8 @@
*
* <p>Comes with bindings for Thing fields.
*/
- static <T extends androidx.appactions.builtintypes.types.Thing,
- BuilderT extends androidx.appactions.builtintypes.types.Thing.Builder<?>>
+ static <T extends androidx.appactions.builtintypes.experimental.types.Thing,
+ BuilderT extends androidx.appactions.builtintypes.experimental.types.Thing.Builder<?>>
TypeSpecBuilder<T, BuilderT> newBuilderForThing(
String typeName,
Supplier<BuilderT> builderSupplier,
diff --git a/appactions/interaction/interaction-capabilities-core/src/test/java/androidx/appactions/interaction/capabilities/core/impl/converters/TypeSpecImplTest.java b/appactions/interaction/interaction-capabilities-core/src/test/java/androidx/appactions/interaction/capabilities/core/impl/converters/TypeSpecImplTest.java
index 9200696..a6615bf 100644
--- a/appactions/interaction/interaction-capabilities-core/src/test/java/androidx/appactions/interaction/capabilities/core/impl/converters/TypeSpecImplTest.java
+++ b/appactions/interaction/interaction-capabilities-core/src/test/java/androidx/appactions/interaction/capabilities/core/impl/converters/TypeSpecImplTest.java
@@ -20,8 +20,8 @@
import static org.junit.Assert.assertThrows;
-import androidx.appactions.builtintypes.properties.Name;
-import androidx.appactions.builtintypes.types.Thing;
+import androidx.appactions.builtintypes.experimental.properties.Name;
+import androidx.appactions.builtintypes.experimental.types.Thing;
import androidx.appactions.interaction.capabilities.core.impl.exceptions.StructConversionException;
import androidx.appactions.interaction.capabilities.core.testing.spec.TestEntity;
import androidx.appactions.interaction.protobuf.Struct;