diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/service/controls/ControlsProviderService.java | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 85ae6a149d31..efa396ef31e0 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -39296,6 +39296,8 @@ package android.service.controls { method public final boolean onUnbind(@NonNull android.content.Intent); method public abstract void performControlAction(@NonNull String, @NonNull android.service.controls.actions.ControlAction, @NonNull java.util.function.Consumer<java.lang.Integer>); method public static void requestAddControl(@NonNull android.content.Context, @NonNull android.content.ComponentName, @NonNull android.service.controls.Control); + field public static final String EXTRA_LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS = "android.service.controls.extra.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS"; + field public static final String META_DATA_PANEL_ACTIVITY = "android.service.controls.META_DATA_PANEL_ACTIVITY"; field public static final String SERVICE_CONTROLS = "android.service.controls.ControlsProviderService"; field @NonNull public static final String TAG = "ControlsProviderService"; } diff --git a/core/java/android/service/controls/ControlsProviderService.java b/core/java/android/service/controls/ControlsProviderService.java index 950c8ac01ce5..65e2390615aa 100644 --- a/core/java/android/service/controls/ControlsProviderService.java +++ b/core/java/android/service/controls/ControlsProviderService.java @@ -58,27 +58,28 @@ public abstract class ControlsProviderService extends Service { * Manifest metadata to show a custom embedded activity as part of device controls. * * The value of this metadata must be the {@link ComponentName} as a string of an activity in - * the same package that will be launched as part of a TaskView. + * the same package that will be launched embedded in the device controls space. * * The activity must be exported, enabled and protected by * {@link Manifest.permission.BIND_CONTROLS}. * - * @hide + * It is recommended that the activity is declared {@code android:resizeableActivity="true"}. */ public static final String META_DATA_PANEL_ACTIVITY = "android.service.controls.META_DATA_PANEL_ACTIVITY"; /** - * Boolean extra containing the value of - * {@link android.provider.Settings.Secure#LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS}. + * Boolean extra containing the value of the setting allowing actions on a locked device. + * + * This corresponds to the setting that indicates whether the user has + * consented to allow actions on devices that declare {@link Control#isAuthRequired()} as + * {@code false} when the device is locked. * * This is passed with the intent when the panel specified by {@link #META_DATA_PANEL_ACTIVITY} * is launched. - * - * @hide */ public static final String EXTRA_LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS = - "android.service.controls.extra.EXTRA_LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS"; + "android.service.controls.extra.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS"; /** * @hide |