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

Commit 9f0dfc87 authored by Andrew Solovay's avatar Andrew Solovay Committed by android-build-merger
Browse files

Merge "docs: Fixing broken HTML" into qt-dev am: b230dd4f

am: be2a68c4

Change-Id: Idb85389aeffdc0661adc685abb7f164f9f9437ab
parents b1d03b90 be2a68c4
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -2330,7 +2330,7 @@ public class Activity extends ContextThemeWrapper
     * calling {@link VoiceInteractor#notifyDirectActionsChanged()}.
     * calling {@link VoiceInteractor#notifyDirectActionsChanged()}.
     *
     *
     * <p>To get the voice interactor you need to call {@link #getVoiceInteractor()}
     * <p>To get the voice interactor you need to call {@link #getVoiceInteractor()}
     * which would return non <code>null<c/ode> only if there is an ongoing voice
     * which would return non <code>null</code> only if there is an ongoing voice
     * interaction session. You an also detect when the voice interactor is no
     * interaction session. You an also detect when the voice interactor is no
     * longer valid because the voice interaction session that is backing is finished
     * longer valid because the voice interaction session that is backing is finished
     * by calling {@link VoiceInteractor#registerOnDestroyedCallback(Executor, Runnable)}.
     * by calling {@link VoiceInteractor#registerOnDestroyedCallback(Executor, Runnable)}.
@@ -2339,7 +2339,7 @@ public class Activity extends ContextThemeWrapper
     * before {@link #onStop()} is being called.
     * before {@link #onStop()} is being called.
     *
     *
     * <p>You should pass to the callback the currently supported direct actions which
     * <p>You should pass to the callback the currently supported direct actions which
     * cannot be <code>null</code> or contain <code>null</null> elements.
     * cannot be <code>null</code> or contain <code>null</code> elements.
     *
     *
     * <p>You should return the action list as soon as possible to ensure the consumer,
     * <p>You should return the action list as soon as possible to ensure the consumer,
     * for example the assistant, is as responsive as possible which would improve user
     * for example the assistant, is as responsive as possible which would improve user