3132 Commits

Author SHA1 Message Date
RoboErik
d133303a5c am ab716047: am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev
* commit 'ab71604780c4cccf238e1c78b7b05310c4a49583':
  Update to MediaBrowser APIs per council feedback
2014-08-28 23:08:20 +00:00
RoboErik
350be2e1c2 Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 2014-08-28 21:51:50 +00:00
RoboErik
3625bf72cb Update to MediaBrowser APIs per council feedback
Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.

bug:17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
2014-08-28 21:11:22 +00:00
Dianne Hackborn
d5b4d7a40a am 2575d022: am c297cc71: am f63aa97c: Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev
* commit '2575d022baf42e0945750703ccc7e5adb65e2009':
  Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
2014-08-28 20:10:33 +00:00
Dianne Hackborn
2db754ac6e Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 2014-08-28 19:33:08 +00:00
Dianne Hackborn
d7c9289f93 Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
It would be good to actually bring the task to the front.

Also, make the flow when inTask is provided better match what happens when
we go looking for a task on our own.

And this includes another fix that was supposed to be part of a different
change but I forgot this class is part of the framework project now.

Change-Id: I3cf05f2e585c0fd7a0dbb7c7cf9fb1655764dd93
2014-08-28 11:38:13 -07:00
John Reck
d21fb2fe93 am 7a86c785: am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev
* commit '7a86c7859b2ccdb4f424c4b9bd946ebf0b4cdf3f':
  Animator stuff
2014-08-28 04:17:37 +00:00
Michael Wright
cb14761ed4 am f06b6386: am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev
* commit 'f06b6386de250240cbaaa5cca922a4f9e8915680':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
2014-08-28 04:17:06 +00:00
John Reck
4c5a27b5f6 Merge "Animator stuff" into lmp-dev 2014-08-28 01:38:58 +00:00
John Reck
119907cd25 Animator stuff
Bug: 17228458

Change-Id: Id884a429a512f9cd2be0ed16dbd0f10e92b4440d
2014-08-27 17:44:25 -07:00
Michael Wright
b4558af745 Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 2014-08-28 00:00:56 +00:00
Michael Wright
219857b900 Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
Also add docs to PowerManager.WakeLock#release(int)

Bug: 17290118
Change-Id: Ibcbc4279efdd0f275808042356e6ff843958e23f
2014-08-27 15:37:27 -07:00
Adam Lesinski
c5bf108e70 Make UsageStats API comply with API Council
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap

Bug:17289531
Change-Id: I8b07a5328a01a0f490b62bc5d9b83c959a3e79c7
2014-08-27 11:57:46 -07:00
Sandeep Siddhartha
ee16bdc33d Address API review comments
- Make Callback an abstract class
- Split manage intents into 3 different methods
- Remove RECOGNITION_FLAGS_NONE

Bug: 17255602
Change-Id: I1329f889bb2ab35938f42d2ecfe755d2b17ec542
2014-08-27 10:23:35 -07:00
Jeff Hao
d72790e900 am 92c7379c: am c4ef03d0: am 73fb1feb: Merge "Add sample profiling option to am." into lmp-dev
* commit '92c7379cf75b6ddce98f03c223d14267227436d2':
  Add sample profiling option to am.
2014-08-26 23:39:57 +00:00
Jeff Hao
1b012d302b Add sample profiling option to am.
Also bundles all profiling options into a class.

Bug: 17040932
Change-Id: I85d675ee1494bdc7308caffdf94145d27c996e9d
2014-08-26 15:54:25 -07:00
Adam Lesinski
d3eb9151b4 am 2626a16b: am 90675431: am a707b2b8: Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev
* commit '2626a16b53267832f13a8c222f7b65514f24ae9d':
  Split up ComponentName in UsageEvents.Event
2014-08-26 20:39:41 +00:00
Dianne Hackborn
e9c13a60c0 am 11bba84c: am f1bb15d2: am 55953caa: Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev
* commit '11bba84c2da1c30e0d3b67456c04995d16a5db52':
  Fix issue #16311398: Limit number of documents a process can open
2014-08-26 20:23:49 +00:00
Adam Lesinski
1dc0f36401 Merge "Split up ComponentName in UsageEvents.Event" into lmp-dev 2014-08-26 20:09:07 +00:00
Dianne Hackborn
4610545dd2 Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 2014-08-26 19:56:26 +00:00
Adam Lesinski
9d9607527f Split up ComponentName in UsageEvents.Event
Some events in the future may not have originated
from a class, so we shouldn't be using ComponentName.

Bug:17259858
Change-Id: Id7fe3245b91596cf27ae4ec51655602f01665622
2014-08-26 12:41:31 -07:00
Dianne Hackborn
89ad456ea4 Fix issue #16311398: Limit number of documents a process can open
In application processes, monitor for when we start getting close
to the Dalvik heap limit, and ask the activity manager to try to
prune old activity instances in that case.

Add an explicit API for apps to ask that they have their own
activity instances cleaned up, if they want.

Fix some bugs in launching activities that were not correctly
applying the "multi task" behavior in the appropriate situations
of document-centric recents.

Clean up the activity manager's process removal code to all share
a common path.

Add a new "Spam" option to ActivityTests, which continually creates
new tasks, checking that the activity manager will now prune old
tasks rather than letting the app run out of RAM.

And while I was was doing this, I found problems with the path
for bringing an empty task to the foreground -- it could make
a new task instead of re-starting the root activity in the
existing task.  This is fixed, and some code in the recents
UI for working around the bug is removed.

And as long as I am doing that, we now have nice hooks in to
the activity manager for AppTask to give some APIs for better
managing the task, so add those along with more tests for these
APIs in ActivityTests.

We should look at also having the activity manager try to prune
old tasks when it sees app processes being killed, to better balance
memory use across multiple processes when some processes may host
many documents.  That however is for another CL...

Change-Id: I2bb81c3f92819350c868c7a7470b35817eb9bea9
2014-08-26 11:16:59 -07:00
Mohamad Ayyash
eeef5845ca am 5b542584: am f53f8d5d: am aaf5d6c0: Merge "Set text color for the output log." into lmp-dev
* commit '5b54258455e9e400939c7593aa1e4c1e67a50752':
  Set text color for the output log.
2014-08-26 17:08:10 +00:00
Mohamad Ayyash
412e4e203f Merge "Set text color for the output log." into lmp-dev 2014-08-26 16:44:28 +00:00
Adam Lesinski
91c37eeed5 am 3c02cb6c: am 114978fd: am 874d4c00: Merge "PM: Load all splits when parsing an app manifest" into lmp-dev
* commit '3c02cb6ccd684a97f3dd74bf523cbb84f00f9bad':
  PM: Load all splits when parsing an app manifest
2014-08-26 10:08:18 +00:00
Mohamad Ayyash
c508d03a94 Set text color for the output log.
In some devices the text color is the same as the background color.

Change-Id: I215d381a427e3b3ed7e29d3078752d093318b53d
2014-08-25 19:27:57 -07:00
Adam Lesinski
6b2416492e Merge "PM: Load all splits when parsing an app manifest" into lmp-dev 2014-08-25 21:41:22 +00:00
Sandeep Siddhartha
7395be6829 am c95d61e1: am b6943e7b: am fe3a5e88: Merge "Fix conversion of locale from BCP47 language tag" into lmp-dev
* commit 'c95d61e15c33519225e2d89af58aeb9843776e2f':
  Fix conversion of locale from BCP47 language tag
2014-08-25 16:58:26 +00:00
Matthew Williams
d308790da6 am efd88692: am f56a5290: am fdb7e602: Merge "Implement API review feedback for JobScheduler" into lmp-dev
* commit 'efd8869219e16506eab663dc228f4a905fa2bcf0':
  Implement API review feedback for JobScheduler
2014-08-25 08:23:52 +00:00
Sandeep Siddhartha
539207b991 am 68f133b4: am a8d8e4c4: am e829259d: Merge "Fix the Locale story in the hotword API" into lmp-dev
* commit '68f133b422733f89c9e226c636ce6153d4e86f1c':
  Fix the Locale story in the hotword API
2014-08-25 08:23:41 +00:00
Sandeep Siddhartha
fb30d6936a Fix conversion of locale from BCP47 language tag
Bug: 17187528
Change-Id: Ifcf707c9be736885f3fc79f3c36087ecf9092971
2014-08-23 16:00:16 -07:00
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