drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,489 Commits 1 Branch 0 Tags
Commit Graph

3051 Commits

Author SHA1 Message Date
Matthew Williams
306908f235 Merge "Implement API review feedback for JobScheduler" into lmp-dev 2014-08-23 02:48:19 +00:00
Sandeep Siddhartha
dcf3068fcb Fix the Locale story in the hotword API 
Tighten the API by taking in a locale rather than a string tag.
Tighten the checks when reading the enrollment metadata, bail out if any
attribute is missing or invalid.
Add missing recycle call for a TypedArray

Stop recognition when sound model(s) change. This is needed during
un-enrollment/re-enrollment.

Bug: 17187528
Bug: 17205230
Change-Id: Idb00b51ef8c4ea0a8f8993decea582223181fa3d
 2014-08-22 17:23:13 -07:00
Adam Lesinski
3bcbd906bc PM: Load all splits when parsing an app manifest 
Previously the base APK would be considered without
any splits loaded into the same AssetManager. This would
prevent splits from overriding attributes in the
AndroidManifest.xml, such as enabled state based on
version, etc.

This CL loads all APKs in the cluster into a common AssetManager
from which the base AndroidManifest.xml is parsed.

Bug:17006358
Change-Id: Ib88096c49d0c4f743b7e6ba0921251459bee107c
 2014-08-22 17:13:00 -07:00
Matthew Williams
d1c06753d0 Implement API review feedback for JobScheduler 
BUG: 17005336

Took the opportunity to clean up some back-off logic

Change-Id: Ibc8ae34d1d44dd064ba071e4cbad17872f7e38cf
 2014-08-22 16:08:45 -07:00
Matthew Williams
0b96e42706 am 7dc5efe2: am 74d65044: am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev 
* commit '7dc5efe28c1b052aa3a8f5d7d60653906f76cbce':
  JobScheduler only run jobs for started users.
 2014-08-22 21:45:08 +00:00
Matthew Williams
12eec2341d Merge "JobScheduler only run jobs for started users." into lmp-dev 2014-08-22 21:08:06 +00:00
Stephen Hines
28aec0ef24 We need to specify a target SDK < 21 to use graphics RS. 
Bug: 16031597

This change also removes some unnecessary code from ScriptC construction.

Change-Id: I6680109deb34de841dfade769d556f5060aee423
(cherry picked from commit 8277a692be3c89519e368159e7707c8d35b89475)
 2014-08-22 01:04:43 -07:00
Matthew Williams
9ae3dbeefc JobScheduler only run jobs for started users. 
BUG: 12876556
Minor changes to test app to make persisting an option.
Change-Id: I1b40347878ec5ca44cd717ebfeb544f6c58473b5
 2014-08-21 20:28:12 -07:00
Stephen Hines
7699bbf5bf am 967d3e72: am 0cb63e25: am fdacc4b5: Merge "We need to specify a target SDK < 21 to use graphics RS." into lmp-dev 
* commit '967d3e7246b45312933bcd8ebef43a02c3baa838':
  We need to specify a target SDK < 21 to use graphics RS.
 2014-08-21 22:17:55 +00:00
Stephen Hines
b020563811 Merge "We need to specify a target SDK < 21 to use graphics RS." into lmp-dev 2014-08-21 21:48:18 +00:00
Adam Lesinski
2362912473 am 4d0cc598: am 275609d6: am e623df3a: Merge "Update Split example with application icon" into lmp-dev 
* commit '4d0cc5989a6e0d459523780f482d45fcf95cc1b5':
  Update Split example with application icon
 2014-08-21 21:02:13 +00:00
Adam Lesinski
269d2d4f69 Update Split example with application icon 
Play console wants the icon in the <application> tag

Change-Id: I83f8e5488ad853e548ba7aba6e32b14602a24ad3
 2014-08-21 12:23:36 -07:00
Adam Lesinski
e003d5d23d am 2ad7e60b: am 271392eb: am 187df3fa: Merge "Update the Split example" into lmp-dev 
* commit '2ad7e60bdf23961c1d9d91e8d24dc7bcf398172a':
  Update the Split example
 2014-08-21 19:22:38 +00:00
Adam Lesinski
49e2fa5c5e Update the Split example 
Caveat: There are two bugs:

- Mipmap definitions get placed in all splits.
- mdpi drawable doesn't get split properly.

Change-Id: I53b8e54cbcb3dfba495ec68e602f98666e8883a7
 2014-08-21 11:38:49 -07:00
Dianne Hackborn
5aef45eca4 am 8c6c54ec: am a7d4d7bc: am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit '8c6c54ecfd281751925ff6df566e154c2f8aec60':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:27:02 +00:00
Dianne Hackborn
aec68bb89f Fix issue #17038762: Add API to add entries to the recents list 
New API Added to ActivityManager for adding an entry.  See docs
there.

Repercussions:

- I hit a bug in system UI where if the thumbnail has alpha, it tries
  to modify it, but thumbnails are loading immutable so crashes.  Fixed
  this by loading the bitmaps to be mutable.
- Improved dump output of recents; there was a lot of stuff missing.
  Also split the recents dump output from the rest of the activity
  output, since it can be really large.
- Added tests to the lovely ActivityTest app.

Bonus: new method on AppTask to control the exclude from recents flag.

Change-Id: I01e543db4d15320ee1701e95872fef73c116526c
 2014-08-20 18:03:43 -07:00
Stephen Hines
d4a4b452bc We need to specify a target SDK < 21 to use graphics RS. 
Bug: 16031597

This change also removes some unnecessary code from ScriptC construction.

Change-Id: I6680109deb34de841dfade769d556f5060aee423
 2014-08-20 17:20:51 -07:00
Dianne Hackborn
c4315c65d2 am f3a1e32f: am a160d4c6: am 3a77663b: Merge "Fix path for handling system window with app token." into lmp-dev 
* commit 'f3a1e32f2482ad531edf7632b1273cde3af0d61b':
  Fix path for handling system window with app token.
 2014-08-18 23:12:26 +00:00
Jeff Brown
b135d06cb8 Remove incomplete media router API. (DO NOT MERGE) 
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
 2014-08-19 20:08:52 -07:00
Dianne Hackborn
15ed2754a3 Fix path for handling system window with app token. 
It is wrong to turn the token into a null appWindowToken; we
need to create a new top-level token as if they had passed in null.

Change-Id: I870d8167c6ed456ea8fd58b149809ec9e0103bce
 2014-08-18 15:48:41 -07:00
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