Robert Ly
7ea8b152ec
am 998cb7d3: am ce861ff3: am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocs
...
* commit '998cb7d3f0881e41fe9ab0570716fc648c760d9e':
docs: gms and gcm javadocs
2013-02-26 02:00:53 +00:00
Robert Ly
998cb7d3f0
am ce861ff3: am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocs
...
* commit 'ce861ff3497c28bbddc40ee2232927c2fa3ab489':
docs: gms and gcm javadocs
2013-02-25 17:58:23 -08:00
Robert Ly
ce861ff349
am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocs
...
* commit 'd470874be53add0ec46436682b4da46768b82497':
docs: gms and gcm javadocs
2013-02-25 17:56:06 -08:00
Robert Ly
d470874be5
am ee46979b: am 05c8e63c: docs: gms and gcm javadocs
...
* commit 'ee46979bde5f59fbeccd01e62fb572c66577e21f':
docs: gms and gcm javadocs
2013-02-25 17:54:32 -08:00
Michael Wright
5633e23c22
Move stack dump off of InputDispatcher thread
...
Change-Id: I7250a0488c3e4c5dc159f4635a57e1e49aa8397a
2013-02-25 17:52:37 -08:00
Robert Ly
ee46979bde
am 05c8e63c: docs: gms and gcm javadocs
...
* commit '05c8e63c760eabfbd1cb19d996038c280472c357':
docs: gms and gcm javadocs
2013-02-25 17:52:13 -08:00
Eino-Ville Talvala
c0e55bd3cf
Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev
2013-02-26 01:36:05 +00:00
Craig Mautner
2e5528c5e0
Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev
2013-02-26 01:08:28 +00:00
Craig Mautner
2ad920759b
Revert ActivityManager changes for tasks. DO NOT MERGE
...
Keeping all activity=>task changes in master and removing them
from jb-mr2.
Revert "Update histories simultaneously."
Revert "Add null check to setAppGroupId."
Revert "Fix crashing bug in validator."
Revert "Switch topRunning* and moveTaskTo*"
Revert "Begin switch over to task based history."
Revert "Reset and reuse Iterators and don't new() one."
Revert "Remove AppWindowToken lists."
Revert "Fix build."
Revert "Remove unused App methods."
Revert "Stop using AppToken movement and start using Task."
Revert "Replace access to mAppTokens with AppTokenIterator"
Revert "Refactor setAppOpVisibility implementation."
Revert "Add AppWindowTokens to TaskList."
Revert "Make ActivityStack.mHistory private."
Revert "Migrate AppWindowToken lists into DisplayContent."
Change-Id: I5722c9a4956dccb52864207e2967690bc58e4ebb
2013-02-25 17:07:39 -08:00
Mathias Agopian
19a38f6f40
Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface" into jb-mr2-dev
2013-02-26 00:55:25 +00:00
Mathias Agopian
89ceb6e2d9
Merge "regenerate GLES java bindings" into jb-mr2-dev
2013-02-26 00:52:37 +00:00
Mathias Agopian
ffddc9b804
Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface
...
also fix a typo that made us call the wrong Surface ctor
Bug: 8225509
Change-Id: I23f92179b6003d4c3e0febb35166c1caeafa27f5
2013-02-25 16:49:57 -08:00
Mathias Agopian
15284dee8e
regenerate GLES java bindings
...
- added most missing validation checks
- glGet* validation reimplement from khronos documentation
Bug: 7402895
Change-Id: I92a805bb1aba1600d3372dc2db22eab08c975d7f
2013-02-25 16:48:44 -08:00
Dianne Hackborn
42bd71e031
Merge "Fix typo." into jb-mr2-dev
2013-02-26 00:33:32 +00:00
Romain Guy
8889eb8d51
Merge "Rename debug property and expose it in HardwareRenderer" into jb-mr2-dev
2013-02-26 00:22:52 +00:00
Romain Guy
08bca88b27
Rename debug property and expose it in HardwareRenderer
...
Change-Id: If46a9bc14a50f6c9a202d901881b36bbac32cba3
2013-02-25 16:21:30 -08:00
Justin Ho
51e7836035
Merge "Revert "Fix ListView is not scrolled properly with arrows"" into jb-mr2-dev
2013-02-26 00:12:25 +00:00
Justin Ho
3cf7b3c592
Revert "Fix ListView is not scrolled properly with arrows"
...
This reverts commit db68fac12daa2cf4a7568308995e218aed92728a.
2013-02-25 16:08:27 -08:00
Dianne Hackborn
035045f8bb
Merge "Add version code constant for JB MR2." into jb-mr2-dev
2013-02-25 23:56:38 +00:00
Dianne Hackborn
45e9ede55f
Add version code constant for JB MR2.
...
Change-Id: I60fc76bbeb3c5e85d716179e9e3ea5758bafaf69
2013-02-25 15:55:37 -08:00
Dianne Hackborn
ec559ff78c
Fix typo.
...
Change-Id: I71c8458e02dc9b9a4c59e51ded37b57a930038f9
2013-02-25 15:42:07 -08:00
Dianne Hackborn
a2fcddd1e6
Merge "Better exceptions when LoadedApk fails." into jb-mr2-dev
2013-02-25 23:41:33 +00:00
Elliott Hughes
84952592ee
am 70347e83: am 8d4d4cf2: Merge "Remove obsolete traceview file format documentation."
...
* commit '70347e83525c861379066d2f20c9105cfd284edb':
Remove obsolete traceview file format documentation.
2013-02-25 23:35:46 +00:00
Robert Ly
05c8e63c76
docs: gms and gcm javadocs
...
Change-Id: I59c11622ee90ec1ce527711afed55818f5818d3f
2013-02-25 15:31:22 -08:00
Elliott Hughes
70347e8352
am 8d4d4cf2: Merge "Remove obsolete traceview file format documentation."
...
* commit '8d4d4cf283d12821caba321204759f2ce3fd210a':
Remove obsolete traceview file format documentation.
2013-02-25 15:30:58 -08:00
Romain Guy
279e8c6421
Merge "Add new property to debug non-rectangular clip operations" into jb-mr2-dev
2013-02-25 23:03:54 +00:00
Romain Guy
3ff0bfdd14
Add new property to debug non-rectangular clip operations
...
This change adds a new property called "debug.hwui.show_stencil_clip"
that accepts the following values:
- "highlight", colorizes in green any drawing command that's tested
against a non-rectangular clip region
- "region", shows the non-rectangular clip region in blue every time
it is used
- "hide", default value, nothing is shown
Change-Id: I83c8602310edc4aaeb8b905371cdd185b17d32b5
2013-02-25 15:01:58 -08:00
Elliott Hughes
8d4d4cf283
Merge "Remove obsolete traceview file format documentation."
2013-02-25 22:50:51 +00:00
Maggie Benthall
40bbc3bb99
Merge "Add location sharing toggle user restriction." into jb-mr2-dev
2013-02-25 21:42:13 +00:00
Romain Guy
eb9dddbffb
Merge "Lookup permission groups by name" into jb-mr2-dev
2013-02-25 21:35:29 +00:00
Romain Guy
01d159d88a
Lookup permission groups by name
...
When a top-level permission group is specified, lookup the group id
by name instead of parsing the value as an integer. This matches
what we do when the group tag is a child of <permission/>.
Change-Id: I54954ae683cecdf72cf846f75383bf6ba862dc5b
2013-02-25 13:22:42 -08:00
Dianne Hackborn
208d937b61
Better exceptions when LoadedApk fails.
...
Change-Id: Iba578c3872c6aeba3bf468735f06bd486d661454
2013-02-25 13:17:54 -08:00
Joe Malin
88a1cf841e
am 0c7d1aba: am b8df147c: am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit '0c7d1abaae25073cafa4542ee032df9c54a01cd9':
Bug 8261430: Typo in Notifications
2013-02-25 19:39:41 +00:00
Joe Malin
0c7d1abaae
am b8df147c: am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit 'b8df147c59381cc66b5acd3718aa3fc1eaa851b6':
Bug 8261430: Typo in Notifications
2013-02-25 11:37:15 -08:00
Joe Malin
b8df147c59
am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit '5c8bba358634b20b47a87dcdb65d01988258cc53':
Bug 8261430: Typo in Notifications
2013-02-25 11:36:02 -08:00
Joe Malin
5c8bba3586
am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit 'cfb153b146b7d1627bdc02e2dc24becb2da5b12b':
Bug 8261430: Typo in Notifications
2013-02-25 11:34:46 -08:00
Joe Malin
cfb153b146
am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
...
* commit '06764394eb9e4ba4e5f87c816827d82c93b5e71c':
Bug 8261430: Typo in Notifications
2013-02-25 11:32:22 -08:00
Joe Malin
06764394eb
Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev
2013-02-25 19:29:06 +00:00
Jeff Sharkey
954e3e9018
Merge "Require command and argument separation, cleanup." into jb-mr2-dev
2013-02-25 19:13:00 +00:00
Jeff Sharkey
7b4596fd68
Require command and argument separation, cleanup.
...
When invoking NativeDaemonCommands, require that base command and
arguments are separate. Clean up reverse tethering commands, and
remove deprecated throttle events.
Change-Id: I302a74130b4f7c3f3045815a56d566e89c8969f6
2013-02-25 11:02:50 -08:00
Scott Main
f4b36ad161
am c4bed529: am 93b4fcf4: am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page
...
* commit 'c4bed529101b233f66e60e18a54ef6c9b97357f4':
docs: add google io registration announcement to home page
2013-02-25 18:46:53 +00:00
Scott Main
c4bed52910
am 93b4fcf4: am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page
...
* commit '93b4fcf44bc9ff3ea3359382fb4ba4e2da6a73c8':
docs: add google io registration announcement to home page
2013-02-25 10:44:16 -08:00
Scott Main
93b4fcf44b
am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page
...
* commit 'f714e0781e30a5cb68326ff2381af3999e0a3e0d':
docs: add google io registration announcement to home page
2013-02-25 10:42:41 -08:00
Scott Main
f714e0781e
am b38066bb: am d51eebae: docs: add google io registration announcement to home page
...
* commit 'b38066bb22e0e71c6e03697d2b3fc18050ff4c76':
docs: add google io registration announcement to home page
2013-02-25 10:41:41 -08:00
Scott Main
b38066bb22
am d51eebae: docs: add google io registration announcement to home page
...
* commit 'd51eebae6d5d798e5af2ec49f77d4b5fcf1678b7':
docs: add google io registration announcement to home page
2013-02-25 10:40:34 -08:00
Scott Main
d51eebae6d
docs: add google io registration announcement to home page
...
Change-Id: I638e9b720f027cd08b5a46f91339597fe954cb42
2013-02-25 10:36:03 -08:00
Joe Fernandez
02a4cec107
am 1f954f2f: am d5f87129: am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev
...
* commit '1f954f2feedbff1ccfd9154611ac915f0c1c2e47':
docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-02-25 18:25:15 +00:00
Joe Fernandez
1f954f2fee
am d5f87129: am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev
...
* commit 'd5f87129757814e7fa83739afb921fe42d9e7454':
docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-02-25 10:22:43 -08:00
Joe Malin
43f81181bc
Bug 8261430: Typo in Notifications
...
Change-Id: Ia0de6eec870f75cb31e082fba5a8b6764d6e4810
2013-02-25 10:20:29 -08:00
Joe Fernandez
d5f8712975
am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev
...
* commit '2ca291b82106b998d544c47454dc595a2430864d':
docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
2013-02-25 10:19:59 -08:00