Skip to content

Commit ebfa67c

Browse files
author
Lucas Muller Oliveira
committed
Move APIs in glance:wear:wear-core into the package androidx.glance.wear.core.
These APIs (currently in Alpha) were split from `glance:wear:wear` but kept their original package since they were already consumed in some places. Public classes moving to the new .core package: ActiveWearWidgetHandle, ContainerInfo, WearWidgetParams, WearWidgetProviderInfo, WidgetInstanceId Relnote: Move APIs in `glance:wear:wear-core` into the package `androidx.glance.wear.core`. Test: existing Change-Id: I429cf4c36d27bc8fc01115194b20806f10950dde
1 parent b2029a2 commit ebfa67c

42 files changed

Lines changed: 187 additions & 161 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎glance/wear/wear-core/api/current.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Signature format: 4.0
2-
package androidx.glance.wear {
2+
package androidx.glance.wear.core {
33

44
public final class ActiveWearWidgetHandle {
55
method @InaccessibleFromKotlin public int getContainerType();
6-
method @InaccessibleFromKotlin public androidx.glance.wear.WidgetInstanceId getInstanceId();
6+
method @InaccessibleFromKotlin public androidx.glance.wear.core.WidgetInstanceId getInstanceId();
77
method @InaccessibleFromKotlin public android.content.ComponentName getProvider();
88
property public int containerType;
9-
property public androidx.glance.wear.WidgetInstanceId instanceId;
9+
property public androidx.glance.wear.core.WidgetInstanceId instanceId;
1010
property public android.content.ComponentName provider;
11-
field public static final androidx.glance.wear.ActiveWearWidgetHandle.Companion Companion;
11+
field public static final androidx.glance.wear.core.ActiveWearWidgetHandle.Companion Companion;
1212
}
1313

1414
public static final class ActiveWearWidgetHandle.Companion {
@@ -26,7 +26,7 @@ package androidx.glance.wear {
2626
field public static final int CONTAINER_TYPE_FULLSCREEN = 0; // 0x0
2727
field public static final int CONTAINER_TYPE_LARGE = 1; // 0x1
2828
field public static final int CONTAINER_TYPE_SMALL = 2; // 0x2
29-
field public static final androidx.glance.wear.ContainerInfo.Companion Companion;
29+
field public static final androidx.glance.wear.core.ContainerInfo.Companion Companion;
3030
}
3131

3232
public static final class ContainerInfo.Companion {
@@ -41,51 +41,51 @@ package androidx.glance.wear {
4141
public final class WearWidgetParams {
4242
method @InaccessibleFromKotlin public int getContainerType();
4343
method @InaccessibleFromKotlin @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public float getHeightDp();
44-
method @InaccessibleFromKotlin public androidx.glance.wear.WidgetInstanceId getInstanceId();
44+
method @InaccessibleFromKotlin public androidx.glance.wear.core.WidgetInstanceId getInstanceId();
4545
method @InaccessibleFromKotlin @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public float getWidthDp();
4646
property public int containerType;
4747
property @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public float heightDp;
48-
property public androidx.glance.wear.WidgetInstanceId instanceId;
48+
property public androidx.glance.wear.core.WidgetInstanceId instanceId;
4949
property @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public float widthDp;
50-
field public static final androidx.glance.wear.WearWidgetParams.Companion Companion;
50+
field public static final androidx.glance.wear.core.WearWidgetParams.Companion Companion;
5151
}
5252

5353
public static final class WearWidgetParams.Companion {
5454
}
5555

5656
public final class WearWidgetProviderInfo {
5757
method @InaccessibleFromKotlin public String? getConfigIntentAction();
58-
method @InaccessibleFromKotlin public java.util.List<androidx.glance.wear.ContainerInfo> getContainers();
58+
method @InaccessibleFromKotlin public java.util.List<androidx.glance.wear.core.ContainerInfo> getContainers();
5959
method @InaccessibleFromKotlin public String getDescription();
6060
method @InaccessibleFromKotlin public String getGroup();
6161
method @InaccessibleFromKotlin public int getIcon();
6262
method @InaccessibleFromKotlin public String getLabel();
6363
method @InaccessibleFromKotlin public int getPreferredContainerType();
6464
method @InaccessibleFromKotlin public android.content.ComponentName getProviderService();
6565
method @InaccessibleFromKotlin public java.util.Map<java.lang.String,java.lang.String> getUnrecognisedAttributes();
66-
method @kotlin.jvm.Throws(exceptionClasses={PackageManager.NameNotFoundException::class, XmlPullParserException::class}) public static androidx.glance.wear.WearWidgetProviderInfo parseFromService(android.content.Context context, android.content.ComponentName providerService) throws android.content.pm.PackageManager.NameNotFoundException, org.xmlpull.v1.XmlPullParserException;
66+
method @kotlin.jvm.Throws(exceptionClasses={PackageManager.NameNotFoundException::class, XmlPullParserException::class}) public static androidx.glance.wear.core.WearWidgetProviderInfo parseFromService(android.content.Context context, android.content.ComponentName providerService) throws android.content.pm.PackageManager.NameNotFoundException, org.xmlpull.v1.XmlPullParserException;
6767
property public String? configIntentAction;
68-
property public java.util.List<androidx.glance.wear.ContainerInfo> containers;
68+
property public java.util.List<androidx.glance.wear.core.ContainerInfo> containers;
6969
property public String description;
7070
property public String group;
7171
property public int icon;
7272
property public String label;
7373
property public int preferredContainerType;
7474
property public android.content.ComponentName providerService;
7575
property public java.util.Map<java.lang.String,java.lang.String> unrecognisedAttributes;
76-
field public static final androidx.glance.wear.WearWidgetProviderInfo.Companion Companion;
76+
field public static final androidx.glance.wear.core.WearWidgetProviderInfo.Companion Companion;
7777
}
7878

7979
public static final class WearWidgetProviderInfo.Companion {
80-
method @kotlin.jvm.Throws(exceptionClasses={PackageManager.NameNotFoundException::class, XmlPullParserException::class}) public androidx.glance.wear.WearWidgetProviderInfo parseFromService(android.content.Context context, android.content.ComponentName providerService) throws android.content.pm.PackageManager.NameNotFoundException, org.xmlpull.v1.XmlPullParserException;
80+
method @kotlin.jvm.Throws(exceptionClasses={PackageManager.NameNotFoundException::class, XmlPullParserException::class}) public androidx.glance.wear.core.WearWidgetProviderInfo parseFromService(android.content.Context context, android.content.ComponentName providerService) throws android.content.pm.PackageManager.NameNotFoundException, org.xmlpull.v1.XmlPullParserException;
8181
}
8282

83-
public final class WearWidgetVisibleEvent implements androidx.glance.wear.WearWidgetEvent {
83+
public final class WearWidgetVisibleEvent implements androidx.glance.wear.core.WearWidgetEvent {
8484
method @InaccessibleFromKotlin public java.time.Duration getDuration();
85-
method @InaccessibleFromKotlin public androidx.glance.wear.WidgetInstanceId getInstanceId();
85+
method @InaccessibleFromKotlin public androidx.glance.wear.core.WidgetInstanceId getInstanceId();
8686
method @InaccessibleFromKotlin public java.time.Instant getStartTime();
8787
property public java.time.Duration duration;
88-
property public androidx.glance.wear.WidgetInstanceId instanceId;
88+
property public androidx.glance.wear.core.WidgetInstanceId instanceId;
8989
property public java.time.Instant startTime;
9090
}
9191

‎glance/wear/wear-core/api/restricted_current.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Signature format: 4.0
2-
package androidx.glance.wear {
2+
package androidx.glance.wear.core {
33

44
public final class ActiveWearWidgetHandle {
55
method @InaccessibleFromKotlin public int getContainerType();
6-
method @InaccessibleFromKotlin public androidx.glance.wear.WidgetInstanceId getInstanceId();
6+
method @InaccessibleFromKotlin public androidx.glance.wear.core.WidgetInstanceId getInstanceId();
77
method @InaccessibleFromKotlin public android.content.ComponentName getProvider();
88
property public int containerType;
9-
property public androidx.glance.wear.WidgetInstanceId instanceId;
9+
property public androidx.glance.wear.core.WidgetInstanceId instanceId;
1010
property public android.content.ComponentName provider;
11-
field public static final androidx.glance.wear.ActiveWearWidgetHandle.Companion Companion;
11+
field public static final androidx.glance.wear.core.ActiveWearWidgetHandle.Companion Companion;
1212
}
1313

1414
public static final class ActiveWearWidgetHandle.Companion {
@@ -26,7 +26,7 @@ package androidx.glance.wear {
2626
field public static final int CONTAINER_TYPE_FULLSCREEN = 0; // 0x0
2727
field public static final int CONTAINER_TYPE_LARGE = 1; // 0x1
2828
field public static final int CONTAINER_TYPE_SMALL = 2; // 0x2
29-
field public static final androidx.glance.wear.ContainerInfo.Companion Companion;
29+
field public static final androidx.glance.wear.core.ContainerInfo.Companion Companion;
3030
}
3131

3232
public static final class ContainerInfo.Companion {
@@ -41,51 +41,51 @@ package androidx.glance.wear {
4141
public final class WearWidgetParams {
4242
method @InaccessibleFromKotlin public int getContainerType();
4343
method @InaccessibleFromKotlin @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public float getHeightDp();
44-
method @InaccessibleFromKotlin public androidx.glance.wear.WidgetInstanceId getInstanceId();
44+
method @InaccessibleFromKotlin public androidx.glance.wear.core.WidgetInstanceId getInstanceId();
4545
method @InaccessibleFromKotlin @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public float getWidthDp();
4646
property public int containerType;
4747
property @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public float heightDp;
48-
property public androidx.glance.wear.WidgetInstanceId instanceId;
48+
property public androidx.glance.wear.core.WidgetInstanceId instanceId;
4949
property @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public float widthDp;
50-
field public static final androidx.glance.wear.WearWidgetParams.Companion Companion;
50+
field public static final androidx.glance.wear.core.WearWidgetParams.Companion Companion;
5151
}
5252

5353
public static final class WearWidgetParams.Companion {
5454
}
5555

5656
public final class WearWidgetProviderInfo {
5757
method @InaccessibleFromKotlin public String? getConfigIntentAction();
58-
method @InaccessibleFromKotlin public java.util.List<androidx.glance.wear.ContainerInfo> getContainers();
58+
method @InaccessibleFromKotlin public java.util.List<androidx.glance.wear.core.ContainerInfo> getContainers();
5959
method @InaccessibleFromKotlin public String getDescription();
6060
method @InaccessibleFromKotlin public String getGroup();
6161
method @InaccessibleFromKotlin public int getIcon();
6262
method @InaccessibleFromKotlin public String getLabel();
6363
method @InaccessibleFromKotlin public int getPreferredContainerType();
6464
method @InaccessibleFromKotlin public android.content.ComponentName getProviderService();
6565
method @InaccessibleFromKotlin public java.util.Map<java.lang.String,java.lang.String> getUnrecognisedAttributes();
66-
method @kotlin.jvm.Throws(exceptionClasses={PackageManager.NameNotFoundException::class, XmlPullParserException::class}) public static androidx.glance.wear.WearWidgetProviderInfo parseFromService(android.content.Context context, android.content.ComponentName providerService) throws android.content.pm.PackageManager.NameNotFoundException, org.xmlpull.v1.XmlPullParserException;
66+
method @kotlin.jvm.Throws(exceptionClasses={PackageManager.NameNotFoundException::class, XmlPullParserException::class}) public static androidx.glance.wear.core.WearWidgetProviderInfo parseFromService(android.content.Context context, android.content.ComponentName providerService) throws android.content.pm.PackageManager.NameNotFoundException, org.xmlpull.v1.XmlPullParserException;
6767
property public String? configIntentAction;
68-
property public java.util.List<androidx.glance.wear.ContainerInfo> containers;
68+
property public java.util.List<androidx.glance.wear.core.ContainerInfo> containers;
6969
property public String description;
7070
property public String group;
7171
property public int icon;
7272
property public String label;
7373
property public int preferredContainerType;
7474
property public android.content.ComponentName providerService;
7575
property public java.util.Map<java.lang.String,java.lang.String> unrecognisedAttributes;
76-
field public static final androidx.glance.wear.WearWidgetProviderInfo.Companion Companion;
76+
field public static final androidx.glance.wear.core.WearWidgetProviderInfo.Companion Companion;
7777
}
7878

7979
public static final class WearWidgetProviderInfo.Companion {
80-
method @kotlin.jvm.Throws(exceptionClasses={PackageManager.NameNotFoundException::class, XmlPullParserException::class}) public androidx.glance.wear.WearWidgetProviderInfo parseFromService(android.content.Context context, android.content.ComponentName providerService) throws android.content.pm.PackageManager.NameNotFoundException, org.xmlpull.v1.XmlPullParserException;
80+
method @kotlin.jvm.Throws(exceptionClasses={PackageManager.NameNotFoundException::class, XmlPullParserException::class}) public androidx.glance.wear.core.WearWidgetProviderInfo parseFromService(android.content.Context context, android.content.ComponentName providerService) throws android.content.pm.PackageManager.NameNotFoundException, org.xmlpull.v1.XmlPullParserException;
8181
}
8282

83-
public final class WearWidgetVisibleEvent implements androidx.glance.wear.WearWidgetEvent {
83+
public final class WearWidgetVisibleEvent implements androidx.glance.wear.core.WearWidgetEvent {
8484
method @InaccessibleFromKotlin public java.time.Duration getDuration();
85-
method @InaccessibleFromKotlin public androidx.glance.wear.WidgetInstanceId getInstanceId();
85+
method @InaccessibleFromKotlin public androidx.glance.wear.core.WidgetInstanceId getInstanceId();
8686
method @InaccessibleFromKotlin public java.time.Instant getStartTime();
8787
property public java.time.Duration duration;
88-
property public androidx.glance.wear.WidgetInstanceId instanceId;
88+
property public androidx.glance.wear.core.WidgetInstanceId instanceId;
8989
property public java.time.Instant startTime;
9090
}
9191

glance/wear/wear-core/src/main/java/androidx/glance/wear/ActiveWearWidgetHandle.kt renamed to glance/wear/wear-core/src/main/java/androidx/glance/wear/core/ActiveWearWidgetHandle.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2025 The Android Open Source Project
2+
* Copyright 2026 The Android Open Source Project
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,12 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package androidx.glance.wear
17+
package androidx.glance.wear.core
1818

1919
import android.content.ComponentName
2020
import androidx.annotation.RestrictTo
21-
import androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP
22-
import androidx.glance.wear.ContainerInfo.ContainerType
2321
import androidx.glance.wear.parcel.ActiveWearWidgetHandleParcel
2422
import androidx.glance.wear.proto.ActiveWearWidgetHandleProto
2523
import java.util.Objects
@@ -34,11 +32,13 @@ import java.util.Objects
3432
* @property containerType The container type of the widget instance.
3533
*/
3634
public class ActiveWearWidgetHandle
37-
@RestrictTo(LIBRARY_GROUP)
35+
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
3836
public constructor(
3937
public val provider: ComponentName,
4038
public val instanceId: WidgetInstanceId,
41-
@get:ContainerType @param:ContainerType public val containerType: Int,
39+
@get:ContainerInfo.ContainerType
40+
@param:ContainerInfo.ContainerType
41+
public val containerType: Int,
4242
) {
4343
override fun equals(other: Any?): Boolean =
4444
when {
@@ -53,9 +53,9 @@ public constructor(
5353
override fun hashCode(): Int = Objects.hash(provider, instanceId, containerType)
5454

5555
override fun toString(): String =
56-
"ActiveWidget{${provider.className}:$instanceId type=${ContainerInfo.containerTypeToString(containerType)}}"
56+
"ActiveWidget{${provider.className}:$instanceId type=${ContainerInfo.Companion.containerTypeToString(containerType)}}"
5757

58-
@RestrictTo(LIBRARY_GROUP)
58+
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
5959
public fun toParcel(): ActiveWearWidgetHandleParcel {
6060
val handleProto =
6161
ActiveWearWidgetHandleProto(
@@ -67,12 +67,13 @@ public constructor(
6767
}
6868

6969
public companion object {
70-
@RestrictTo(LIBRARY_GROUP)
70+
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
7171
public fun fromParcel(
7272
handleParcel: ActiveWearWidgetHandleParcel,
7373
provider: ComponentName,
7474
): ActiveWearWidgetHandle {
75-
val handleProto = ActiveWearWidgetHandleProto.ADAPTER.decode(handleParcel.payload)
75+
val handleProto =
76+
ActiveWearWidgetHandleProto.Companion.ADAPTER.decode(handleParcel.payload)
7677
return ActiveWearWidgetHandle(
7778
provider = provider,
7879
instanceId = WidgetInstanceId(handleProto.id_namespace, handleProto.id),

glance/wear/wear-core/src/main/java/androidx/glance/wear/WearWidgetEvent.kt renamed to glance/wear/wear-core/src/main/java/androidx/glance/wear/core/WearWidgetEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package androidx.glance.wear
17+
package androidx.glance.wear.core
1818

1919
import androidx.annotation.RestrictTo
2020
import androidx.glance.wear.parcel.WearWidgetEventBatchParcel

0 commit comments

Comments
 (0)