summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorSandeep Siddhartha <sansid@google.com>2013-09-09 23:25:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-09 23:25:27 +0000
commit85e7177abe3024218de589a94bc0914bcfe51547 (patch)
treed7f294fba00fca16f6fa5d316934669bce0edbf0 /packages
parentbce89a426978ab7bd40e5fa9eb2d99e569422a2e (diff)
parent1f0ef2cc33e5b8fe00a869c22eabfd08cf7de504 (diff)
downloadframeworks_base-85e7177abe3024218de589a94bc0914bcfe51547.zip
frameworks_base-85e7177abe3024218de589a94bc0914bcfe51547.tar.gz
frameworks_base-85e7177abe3024218de589a94bc0914bcfe51547.tar.bz2
Merge "Move public consts to HotwordRecognitionService" into klp-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java13
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);
}
}
}