Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff8194be authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge changes from topic "261990872" 

* changes:
  Unhide new API for Device Controls panel
  Release flags for device controls panel
parents 655beb33 91a3484e

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -39361,6 +39361,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";

  }

core/java/android/service/controls/ControlsProviderService.java

+8 −7
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+2 −2
Original line number Diff line number Diff line
@@ -447,11 +447,11 @@ object Flags { 
    @JvmField val NOTE_TASKS = unreleasedFlag(1900, "keycode_flag")



    // 2000 - device controls

    @Keep @JvmField val USE_APP_PANELS = unreleasedFlag(2000, "use_app_panels", teamfood = true)

    @Keep @JvmField val USE_APP_PANELS = releasedFlag(2000, "use_app_panels", teamfood = true)



    @JvmField

    val APP_PANELS_ALL_APPS_ALLOWED =

        unreleasedFlag(2001, "app_panels_all_apps_allowed", teamfood = true)

        releasedFlag(2001, "app_panels_all_apps_allowed", teamfood = true)



    // 2100 - Falsing Manager

    @JvmField val FALSING_FOR_LONG_TAPS = releasedFlag(2100, "falsing_for_long_taps")