diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-06-02 22:10:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-02 22:10:36 +0000 |
| commit | b3d5856e68e3c5ba23381097ca184426ca3f626f (patch) | |
| tree | 371ba6c1d2e32b189aac5d8367c3fc12ddb0e063 /core/java/android | |
| parent | 47297e8f82118555cae7afb1bf4c713a26a98a22 (diff) | |
| parent | b75a69f9b3dfe1499828c6e092bf40f69be18bbf (diff) | |
| download | frameworks_base-b3d5856e68e3c5ba23381097ca184426ca3f626f.zip frameworks_base-b3d5856e68e3c5ba23381097ca184426ca3f626f.tar.gz frameworks_base-b3d5856e68e3c5ba23381097ca184426ca3f626f.tar.bz2 | |
am f3c294df: Merge "Code cleaning" into lmp-preview-dev
* commit 'f3c294df46bab8f50bead51e70f562778b8c5deb':
Code cleaning
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/VoiceInteractor.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/VoiceInteractor.java b/core/java/android/app/VoiceInteractor.java index f332c9d..85e970c 100644 --- a/core/java/android/app/VoiceInteractor.java +++ b/core/java/android/app/VoiceInteractor.java @@ -43,7 +43,7 @@ import java.util.ArrayList; * {@link Request} subclass describing the type of operation to perform -- currently the * 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 * time. * @@ -51,7 +51,7 @@ import java.util.ArrayList; * 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 * {@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. */ public class VoiceInteractor { @@ -236,7 +236,7 @@ public class VoiceInteractor { * 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 * 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 * can start a new non-voice activity. Be sure when starting the new activity * to use {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK |