diff options
| author | Selim Cinek <cinek@google.com> | 2015-05-05 23:52:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 23:52:35 +0000 |
| commit | 6329bbceebc8c0d6de164cb693a828402542fd35 (patch) | |
| tree | 36671db8a9145fdf11f3d928622c26aa766581b4 /core/res | |
| parent | 9c7ce8b0fc8e429e2524b346174cb67b59c7e175 (diff) | |
| parent | e70d6535237d2e6f03adcd0bdc11e45ea714dc97 (diff) | |
| download | frameworks_base-6329bbceebc8c0d6de164cb693a828402542fd35.zip frameworks_base-6329bbceebc8c0d6de164cb693a828402542fd35.tar.gz frameworks_base-6329bbceebc8c0d6de164cb693a828402542fd35.tar.bz2 | |
Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index fe5862b..2914817 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -7306,6 +7306,9 @@ <!-- Flag indicating whether this voice interaction service is capable of handling the assist action. --> <attr name="supportsAssist" format="boolean" /> + <!-- Flag indicating whether this voice interaction service is capable of being launched + from the keyguard. --> + <attr name="supportsLaunchVoiceAssistFromKeyguard" format="boolean" /> </declare-styleable> <!-- Use <code>voice-enrollment-application</code> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 91c3d2e..83ac6c1 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2685,4 +2685,5 @@ <public type="attr" name="assistBlocked" /> <public type="attr" name="stylusButtonPressable" /> + <public type="attr" name="supportsLaunchVoiceAssistFromKeyguard" /> </resources> |