diff options
| author | Sandeep Siddhartha <sansid@google.com> | 2013-09-09 16:30:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-09 16:30:10 -0700 |
| commit | e6139bf08680120cf1437621f2aadabd82a50197 (patch) | |
| tree | e5c538d6397d636a0679fb7606e8bfd08ef0aee9 /packages | |
| parent | be4b48240e2e498ad32894ae9ab9716ecfedcf45 (diff) | |
| parent | 85e7177abe3024218de589a94bc0914bcfe51547 (diff) | |
| download | frameworks_base-e6139bf08680120cf1437621f2aadabd82a50197.zip frameworks_base-e6139bf08680120cf1437621f2aadabd82a50197.tar.gz frameworks_base-e6139bf08680120cf1437621f2aadabd82a50197.tar.bz2 | |
am 85e7177a: Merge "Move public consts to HotwordRecognitionService" into klp-dev
* commit '85e7177abe3024218de589a94bc0914bcfe51547':
Move public consts to HotwordRecognitionService
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java index 78b842c..40a1af6 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java @@ -50,6 +50,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.speech.hotword.HotwordRecognitionListener; +import android.speech.hotword.HotwordRecognitionService; import android.speech.hotword.HotwordRecognizer; import android.telephony.TelephonyManager; import android.util.AttributeSet; @@ -1775,11 +1776,13 @@ public class KeyguardHostView extends KeyguardViewBase { public void onHotwordEvent(int eventType, Bundle eventBundle) { if (DEBUG) Log.d(TAG, "onHotwordEvent: " + eventType); - if (eventType == HotwordRecognizer.EVENT_TYPE_STATE_CHANGED) { - if (eventBundle != null && eventBundle.containsKey(HotwordRecognizer.PROMPT_TEXT)) { - new KeyguardMessageArea.Helper( - (View) getSecurityView(mCurrentSecuritySelection)) - .setMessage(eventBundle.getString(HotwordRecognizer.PROMPT_TEXT),true); + if (eventType == HotwordRecognitionService.EVENT_TYPE_PROMPT_CHANGED) { + if (eventBundle != null + && eventBundle.containsKey(HotwordRecognitionService.KEY_PROMPT_TEXT)) { + new KeyguardMessageArea + .Helper((View) getSecurityView(mCurrentSecuritySelection)) + .setMessage(eventBundle.getString( + HotwordRecognitionService.KEY_PROMPT_TEXT),true); } } } |