3031 Commits

Author SHA1 Message Date
Adam Lesinski
fe2ee96947 am d6ce3e36: am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev
* commit 'd6ce3e363ea229d4e00946492be2c9d60a2b049b':
  Add FeatureGroup to PackageInfo
2014-08-16 00:44:55 +00:00
Erik Pasternak
9b4f710618 am eaa45c68: am 93228d99: am b7d0449d: Merge "Add metadata and notifications to OneMedia" into lmp-dev
* commit 'eaa45c688f582baeb118f399d337d1adadd95de7':
  Add metadata and notifications to OneMedia
2014-08-15 21:11:30 +00:00
Adam Lesinski
d3edfde51b Add FeatureGroup to PackageInfo
FeatureGroups replace top-level FeatureInfo objects.
FeatureGroups inherit top-level FeatureInfos but override
them if the feature names are the same.

Bug:16822121

Change-Id: I80b2cb778a0fbcb4521efce986fba641e0914290
2014-08-15 15:53:35 -07:00
RoboErik
8338155a4a am 3ddb9890: am 55088a99: am 098e4e09: Merge "Fix dates on copywrite in new test code" into lmp-dev
* commit '3ddb98904cea632180fae22441cd0d2046923093':
  Fix dates on copywrite in new test code
2014-08-15 05:06:45 +00:00
Daniel Sandler
45f7ee8201 Add metadata and notifications to OneMedia
This wires up a notification and some basic metadata for testing
in OneMedia.

Change-Id: I0f2e922536c85caa63f66dae7deb55ffe94fe231
2014-08-14 16:18:15 -07:00
RoboErik
e7ba237ce4 Merge "Fix dates on copywrite in new test code" into lmp-dev 2014-08-14 16:10:21 +00:00
RoboErik
83e3152449 Fix dates on copywrite in new test code
Some of the copywrites in the new browser test code still had 2010
as the year instead of 2014.

Change-Id: I33d19b1ad7f4bbbc8f93d9fb6acc8a92db401807
2014-08-13 13:54:49 -07:00
Ying Wang
26c19b8853 am 14216f1f: am 078d9d80: am d364499e: Remvoe build log spam.
* commit '14216f1fb49fb68a275eb04955a148a7c41e4700':
  Remvoe build log spam.
2014-08-13 18:17:57 +00:00
Ying Wang
160c6fc1e9 Remvoe build log spam.
Change-Id: I87a0864d1f4d1c01f660f2bb603b5d0b42e19b53
2014-08-13 10:59:46 -07:00
Geoff Mendal
c66d378e04 am 42ebe8aa: am 95a15723: am 9c7ea559: Don\'t double count the left/top when using bitmap cache in VectorDrawable.
* commit '42ebe8aab656e1a5345e964c61f987a64863bbdd':
  Don't double count the left/top when using bitmap cache in VectorDrawable.
2014-08-11 20:47:48 +00:00
ztenghui
6661341596 Don't double count the left/top when using bitmap cache in VectorDrawable.
bug:16861184

Change-Id: I0530602957a434b222725b6fcbc1af165ee05835
2014-08-11 10:16:22 -07:00
Barnaby James
aa6983e932 am 69d4c16b: am fc5a45fd: am 57ab4478: Merge "Make Test Voice Interactor support new requirements." into lmp-dev
* commit '69d4c16bd7fe2530f8fd35f04b87cb3034d8bafe':
  Make Test Voice Interactor support new requirements.
2014-08-11 14:44:37 +00:00
Barnaby James
0134fd8139 Make Test Voice Interactor support new requirements.
Add settings activity and stub RecognizerService to voice interactor test.

Change-Id: I3c3dda7d2c30eac5e0b889c0c7305dc8f4dfbcb9
2014-08-09 21:24:52 -07:00
Adam Lesinski
f23e6bd45f am 46d239e7: am 8677fbb2: am 96dc0629: Merge "AAPT support for feature splits" into lmp-dev
* commit '46d239e7c2d39cfc62262315c22df78f7497120f':
  AAPT support for feature splits
2014-08-09 04:21:03 +00:00
Adam Lesinski
ec64709ce0 Merge "AAPT support for feature splits" into lmp-dev 2014-08-09 00:40:15 +00:00
Adam Lesinski
2586c89656 am 0bb27d84: am ed9be6fb: am 38daa3c5: Merge "Second iteration of the UsageStats API" into lmp-dev
* commit '0bb27d848264459c08f3d81406edb591c54aad87':
  Second iteration of the UsageStats API
2014-08-08 22:49:43 +00:00
Guang Zhu
72f6564e92 am 3c4c0848: am a61a2b3a: am 011caab6: Merge "freeze screen rotation during memory and app launch test" into lmp-dev
* commit '3c4c0848a39311ad5320c0f2482fc1355f956961':
  freeze screen rotation during memory and app launch test
2014-08-08 18:51:00 +00:00
Adam Lesinski
81f6d857c1 Merge "Second iteration of the UsageStats API" into lmp-dev 2014-08-08 18:15:47 +00:00
Adam Lesinski
3516800b61 Second iteration of the UsageStats API
Based on feedback from API council, updated the API.
Also added support for querying the event log.

Change-Id: Ibaa008b9e5bd145acdfe8e20c25c2ed2d96be123
2014-08-08 12:08:15 -07:00
RoboErik
c660d0266c am 7e63287b: am 7a312929: am 6ac104ce: Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev
* commit '7e63287b7d1732df3015d102b508fff9eb3a3afd':
  Combine MediaSession Callback and TransportControlsCallback
2014-08-08 17:52:46 +00:00
RoboErik
6d9fe654b5 Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev 2014-08-08 17:26:08 +00:00
Guang Zhu
4ed52ab752 Merge "freeze screen rotation during memory and app launch test" into lmp-dev 2014-08-08 16:09:03 +00:00
Guang Zhu
e2a03fe43d freeze screen rotation during memory and app launch test
Change-Id: I2a039be383562019a0af9470c5053cd3cb1e6142
2014-08-08 11:30:21 -07:00
Guang Zhu
e126de3ec7 am e8755929: am e98bc03f: am 9fa9213a: Merge "Improve error detection in app compitibility test" into lmp-dev
* commit 'e87559293a721aec812e5633824a1ec73304950f':
  Improve error detection in app compitibility test
2014-08-08 04:10:17 +00:00
ztenghui
6de50540e4 am 8598b11f: am 1acf763b: am b236c8b1: Removing fill and stroke opacity
* commit '8598b11f4b9b7c0b57d83dbe01c839cf41874e09':
  Removing fill and stroke opacity
2014-08-08 02:25:18 +00:00
Sandeep Siddhartha
140dd87333 am 22a3c9e6: am 9ac2891f: am 53f4a335: Merge "Handle microphone contention/Phone calls while recognition is active" into lmp-dev
* commit '22a3c9e6d899197f772837dabb810a539d3782ac':
  Handle microphone contention/Phone calls while recognition is active
2014-08-08 02:21:46 +00:00
Sandeep Siddhartha
a8054cfe3c am 73d5dc67: am 969edb82: am 5885981a: Merge "Fix build break" into lmp-dev
* commit '73d5dc67665778a5cf01dc0cb0d586e57834c991':
  Fix build break
2014-08-08 02:21:29 +00:00
RoboErik
477d1197c3 Combine MediaSession Callback and TransportControlsCallback
This combines them into a single Callback class and adds default
handling to media buttons to check the available actions and call
one of the other methods if appropriate.

Change-Id: If9897d8cf6d8d8046aa85a646c22382f1db1461b
2014-08-07 16:54:52 -07:00
ztenghui
f143ae8ffe Removing fill and stroke opacity
bug:16850076

attrs/public.xml update will be separated for build break friday.

Change-Id: I5863193d5fecd7e210bd6db5294868f1a70e0d2f
2014-08-07 22:48:46 +00:00
Sandeep Siddhartha
cb4e81c7fe Handle microphone contention/Phone calls while recognition is active
Internally we pause the recognition when:
 - a phone call is active/off-hook/ringing
 - or some other application grabs the microphone

we auto-resume when the condition that caused us to pause reverses.

Both these events are notified to the client via callbacks so that they can choose to display on their UI,
that the recognition is paused for some reason.

Bug: 16515468
Bug: 16740806
Bug: 16514535
Change-Id: Ib274d68522c8cf37d42402c875b16159957657f0
2014-08-07 11:53:02 -07:00
Sandeep Siddhartha
db92e35211 Fix build break
Change-Id: I7af700671f1a2e910b6e08498381c8adb40631f8
2014-08-07 11:23:03 -07:00
Maxim Siniavine
dfe1bdcf43 Improve error detection in app compitibility test
Change-Id: I3ee02e41b835715d1b6aaf8048fbb16a6bd00b8a
2014-08-07 18:48:46 -07:00
Barnaby James
cb18825357 Fix VoiceInteractionService.isActiveService.
Small fix + added to the test application.

Change-Id: I05ad84c32064fc98d3bb90eff921702af9855a66
2014-08-06 14:16:04 -07:00
ztenghui
d1c89b1dd6 Add stroke related test to the VectorDrawableTest
Change-Id: I7dceebd58d9365cf8e2a31dfeec418aa439bacb6
2014-08-06 18:07:16 +00:00
Adam Lesinski
833f3ccbc8 AAPT support for feature splits
This change allows the developer to add a base package for
which to build a feature split. The generated resource types
will begin after the base APK's defined types so as not
to collide or override resources.

Multiple features can be generated by first choosing an
arbitrary order for the features. Then for each feature,
the base APK and any preceding features are specified
with the --feature-of flags.

So with a base APK 'A' and features, 'B', and 'C',
'B' would be built with

aapt package [...] --feature-of A [...]

and 'C' would be built with

aapt package [...] --feature-of A --feature-of B [...]

Change-Id: I1be66e3f8df9a737b21c71f8a93685376c7e6780
2014-08-04 18:48:14 -07:00
RoboErik
75847b98f3 Add display metadata and change strings to CharSequences
This adds some fields for display purposes to MediaMetadata and also
makes the default for all text CharSequence instead of String. Also
adds a hidden method for getting a Description for the metadata.

bug: 11708293
Change-Id: I0ed58d9ac3aeff41325c4ccf5fed0539bbf03b4d
2014-08-05 14:30:27 -07:00
Eric Laurent
40b8ef99a5 Merge "SoundTrigger API update." into lmp-dev 2014-08-05 00:34:22 +00:00
Przemyslaw Szczepaniak
fd80746bb9 Set the TTS voice name for the default language.
This changes makes the initial, default language set and
the #setLanguage call with the default language as input
exactly the same.

Previously, the requests made after the initial default language
set were missing the name of the default voice.

+ Some tests clean-up. Some of them fail due to issues with
Locale#toLanguageTag upper-casing the variant field.

Change-Id: I5470617007fe45462b7198bf62a03eb5fe47a590
2014-08-05 14:50:34 +01:00
Eric Laurent
d3b8223377 SoundTrigger API update.
Add sound model update callback.
Add native service state change callback.
Add vendor UUID in sound model description.
Add coarse confidence level in recognition event.
Add capture format in recognition event.

Bug: 12378680.

Change-Id: Id63437819ec7b9a4a69e1ff6185b747e20cad95e
2014-08-04 16:35:27 -07:00
ztenghui
5eb5cde467 Fix one typo and add linear progress bar in the test.
Change-Id: Ib516fd4a27000d8e69a6640386332140ff0d6fdd
2014-08-04 20:46:20 +00:00
Sandeep Siddhartha
2c0273e50a Add a flag for multiple triggers with same recognition session
Also annotate the flags with @IntDef to make things clearer and safer

Add more debug logging

Revert to start/stop being synchronous since telephony and microphone will
need to be handled internally.

Bug: 16731586
Bug: 16514535
Bug: 16549061
Change-Id: I83695d52e9547269c95d443e4d921c9238b7401e
2014-08-01 17:46:27 -07:00
Sandeep Siddhartha
668327d028 Tighten the checks around a detector being invalidated
Don't call back for a detector being marked invalid because
that happens when someone else obtains a detector or VIS shuts down,
in either case we don't want a loop where two entities keep creating new detectors
and being invalidated.

Don't call back on an invalid detector for availability change/detected/started and stopped
only propagate errors.

This helps us with cases where a callback for the previous VIS may get called and then crash because it
tries to make calls without being the current VIS.

In the new scheme of things, if the VIS changes, or the current VIS obtains a new AlwaysOnHotwordDetector,
the previous one is shutdown and internally marked as invalid and all calls to it fail with an IllegalStateException.

Bug: 16629417
Change-Id: I74417bf76ba80916ebc21b042c18b3467857733e
2014-07-31 15:48:26 -07:00
Adam Lesinski
63e646eed5 Add shared library support to aapt dump
AAPT dump should be able to handle dynamic references
that often come with shared library resources.

Bug:16678251
Change-Id: I6c8cd943145aab20ca9db9694c8c433b3c64279b
2014-07-30 21:53:48 +00:00
Sandeep Siddhartha
1ed12ddb8c Make startRecognition async
- This is needed for telephony and audio integration which should happen via async callbacks
that'll end up starting/stopping recognition.

e.g. if a startRecognition happens when in a phone call - the onDetectionStarted will get called once the phone
call ends.

For now the transient stoppages due to internal reasons will not be propagated back to the client.

Bug: 16514535
Bug: 16515468
Change-Id: I1b2b8edd28f5c5e67c453f66c23e1a67a626114e
2014-07-30 11:43:41 -07:00
Sandeep Siddhartha
6817337118 Read the keyphrase ID from the recognition event
Bug: 16516658
Change-Id: Ibeee81c9543aa1091bb075066cfc2269107f13c0
2014-07-29 11:24:51 -07:00
Matthew Williams
ee410da42b remove possible JobScheduler race in cancel()
Client can jobFinished() before getting a cancel msg.
1) Do better clean up of JobServiceContext after client jobFinished()
to remove superfluous MSG_CANCELs
2) When processing MSG_CANCEL check whether the context is still active
3) Do JobServiceContext cleanup before calling back to JobSchedulerService
Client can get a cancel msg even after calling jobFinished() (opposite to above)
1) explicitly check whether there are any MSG_CALLBACKs in the queue before
processing a MSG_CANCEL. If there are we can throw away the cancel.

Bug: 16547638
Change-Id: I90644586c7895a9ce97de752a5d657faf7f74b78
2014-07-29 11:11:41 -07:00
Adam Lesinski
ae9e68a349 Merge "Have AEP GL feature depend on GLES 3.1 in badging" into lmp-dev 2014-07-28 22:45:16 +00:00
RoboErik
40495e0545 Fix checkbuild
Change-Id: I66321c6da4f921cee2db6f9f05312a6a8edc66d3
2014-07-29 15:51:07 +00:00
Adam Lesinski
d7a94da476 Have AEP GL feature depend on GLES 3.1 in badging
AAPT dump badging should output the uses-gl-es tag with
a version of 3.1 when android.hardware.opengles.aep is
declared as a feature.

Change-Id: I8affc6dad574c8303c6ba9810ad8e6e205ea9506
2014-07-25 22:45:33 +00:00
Yao Chen
8470857ee4 Fix build
Change-Id: Ia2a09417451dd9cdca0a6351b8ddd00f9195f361
2014-07-25 11:01:45 -07:00