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

Commit b3d5856e authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am f3c294df: Merge "Code cleaning" into lmp-preview-dev

* commit 'f3c294df46bab8f50bead51e70f562778b8c5deb':
  Code cleaning
parents 47297e8f b75a69f9
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ import java.util.ArrayList;
 * {@link Request} subclass describing the type of operation to perform -- currently the
 * {@link Request} subclass describing the type of operation to perform -- currently the
 * possible requests are {@link ConfirmationRequest} and {@link CommandRequest}.
 * possible requests are {@link ConfirmationRequest} and {@link CommandRequest}.
 *
 *
 * <p>Once a request is submitted, the voice system will process it and evetually deliver
 * <p>Once a request is submitted, the voice system will process it and eventually deliver
 * the result to the request object.  The application can cancel a pending request at any
 * the result to the request object.  The application can cancel a pending request at any
 * time.
 * time.
 *
 *
@@ -51,7 +51,7 @@ import java.util.ArrayList;
 * if an activity is being restarted with retained state, it will retain the current
 * if an activity is being restarted with retained state, it will retain the current
 * VoiceInteractor and any outstanding requests.  Because of this, you should always use
 * VoiceInteractor and any outstanding requests.  Because of this, you should always use
 * {@link Request#getActivity() Request.getActivity} to get back to the activity of a
 * {@link Request#getActivity() Request.getActivity} to get back to the activity of a
 * request, rather than holding on to the actvitity instance yourself, either explicitly
 * request, rather than holding on to the activity instance yourself, either explicitly
 * or implicitly through a non-static inner class.
 * or implicitly through a non-static inner class.
 */
 */
public class VoiceInteractor {
public class VoiceInteractor {
@@ -236,7 +236,7 @@ public class VoiceInteractor {
         * Reports that the current interaction can not be complete with voice, so the
         * Reports that the current interaction can not be complete with voice, so the
         * application will need to switch to a traditional input UI.  Applications should
         * application will need to switch to a traditional input UI.  Applications should
         * only use this when they need to completely bail out of the voice interaction
         * only use this when they need to completely bail out of the voice interaction
         * and switch to a traditional UI.  When the resonsponse comes back, the voice
         * and switch to a traditional UI.  When the response comes back, the voice
         * system has handled the request and is ready to switch; at that point the application
         * system has handled the request and is ready to switch; at that point the application
         * can start a new non-voice activity.  Be sure when starting the new activity
         * can start a new non-voice activity.  Be sure when starting the new activity
         * to use {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK
         * to use {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK