75491 Commits

Author SHA1 Message Date
Scott Main
b90b823e1f am 508456c0: am baa0a185: am 71427bae: docs: fix broken link
* commit '508456c046c2bc53eb61d668cc9998940ecc9778':
2012-04-24 14:27:32 -07:00
Dianne Hackborn
8238e717df Add new signature-level permission to get details of tasks.
Third party apps now can't get access to the extras of the
intents associated with tasks, to keep private data in them
from leaking out.

Change-Id: I95af9e181ac42557bc8b981807e7ddd266a88d0e
2012-04-24 14:27:02 -07:00
Travis Geiselbrecht
fd135bc809 am f4b6628e: BootAnimation: fix bug to delay the appropriate amount of time per frame
* commit 'f4b6628e5084bf317eab5326c51cbecb8fabdc45':
  BootAnimation: fix bug to delay the appropriate amount of time per frame
2012-04-24 14:23:25 -07:00
Adam Powell
b71a5bc02b Check for valid records associated with activity tokens in
ActivityManagerService up-navigation methods.

Silly monkeys.

Fixes bug 6328725

Change-Id: Ifec3f162bdfc2e7e872a689210752c0f6b9b0ab7
2012-04-24 14:20:57 -07:00
John Reck
4961295d19 Merge "Use the right timeout" 2012-04-24 14:18:17 -07:00
Travis Geiselbrecht
f4b6628e50 BootAnimation: fix bug to delay the appropriate amount of time per frame
Change-Id: I300b67a97a9a685cec59df12d8d605c2b0b49180
2012-04-24 14:14:55 -07:00
John Reck
d7156d3f47 Use the right timeout
oops

Change-Id: I667b849af4c5d4fece42e9bcbc5b6b9951b955bb
2012-04-24 14:14:47 -07:00
Steve Block
2318889909 Merge "Add tests for reflection and improve JavaDoc for Java Bridge" 2012-04-24 14:11:26 -07:00
Scott Main
ba69821620 am 8ad5740e: am b3914283: am ffad98c7: docs: fix markup error in resource sidenav
* commit '8ad5740ec1d84cd4c8c8dbbd25ab2f6bcea7b2db':
2012-04-24 13:58:19 -07:00
Scott Main
056bbe926a am 12d21185: am 186c1de7: am ffad98c7: docs: fix markup error in resource sidenav
* commit '12d211853ce252b120d97da071d4a46763981cea':
2012-04-24 13:58:11 -07:00
Scott Main
5bdfa6805a am 81b7e491: am 08a894ca: am 5f8173f3: docs: fix javadoc link
* commit '81b7e4918291e8bc9ea31ae196e0d473c862af5a':
2012-04-24 13:58:04 -07:00
Scott Main
856103c8fd am 2da97094: am 4540bcd8: am 5f8173f3: docs: fix javadoc link
* commit '2da97094a6f73607a8044ccd241f0863e7adcb2f':
2012-04-24 13:58:02 -07:00
Scott Main
9186fda826 am 178e6e6a: am 5f831aee: am 421854e6: docs: add fragments class to training TOC
* commit '178e6e6a4b39546bc176f59bc21a9c80b281f328':
2012-04-24 13:57:58 -07:00
Scott Main
ae5485eb2a am aa364266: am fa6ddddd: am 421854e6: docs: add fragments class to training TOC
* commit 'aa364266fe51705a96766090eee01cee42293be6':
2012-04-24 13:57:56 -07:00
Scott Main
fe1023ac8c am 3a2fcf73: am 28dd9d83: am 67e988e0: Merge "docs: for AU basic training on fragments including ZIP for sample app" into ics-mr1
* commit '3a2fcf73c4050281e41a9f6bd42fc80035e2b3b3':
2012-04-24 13:57:54 -07:00
Scott Main
74a24aa27b am 1324aff1: am 883ae2b9: am 6ea11c0a: Merge "docs: Add 101 class on activity lifecycle including ZIP for sample app" into ics-mr1
* commit '1324aff1c863aac244125dfa7092bbb79f472a33':
2012-04-24 13:57:53 -07:00
Scott Main
bf6130bfff am c7a8f17f: am 718c2f4d: am 67e988e0: Merge "docs: for AU basic training on fragments including ZIP for sample app" into ics-mr1
* commit 'c7a8f17fb85ccbd6d4689bb8fd96eb4052aff9fa':
2012-04-24 13:57:41 -07:00
Scott Main
bb84e2a50f am 19103c72: am 25d27074: am 6ea11c0a: Merge "docs: Add 101 class on activity lifecycle including ZIP for sample app" into ics-mr1
* commit '19103c720a1d52a53710107eb3fcc195bd604c0e':
2012-04-24 13:57:38 -07:00
Dirk Dougherty
05c1de9486 am 9d6d3eb3: am 08979f29: am 2a73a218: Doc change: Add link target for developer video block.
* commit '9d6d3eb34063b8aa6ffd177d3657d859fde87273':
2012-04-24 13:57:36 -07:00
Dirk Dougherty
cbd4b8fc15 am 1ef3d4ef: am fd8c8af2: am 2a73a218: Doc change: Add link target for developer video block.
* commit '1ef3d4efa161510ff986432c2f0d37bba6b3e881':
2012-04-24 13:57:34 -07:00
Dirk Dougherty
a85dd987fb am 14dfc618: am 31377696: am 3e6b20be: Doc change: update links to developer video.
* commit '14dfc6183a4d93b3d2c3c594428acc8999b153d4':
2012-04-24 13:57:32 -07:00
Dirk Dougherty
40baea7249 am 66edbfa2: am 0f340ab3: am 3e6b20be: Doc change: update links to developer video.
* commit '66edbfa2cd9d21e9884659a19bf9acfbbe444c47':
2012-04-24 13:57:30 -07:00
Jean-Baptiste Queru
30a2f74222 am 75b1c301: am ed11920c: am 60247737: Merge "Fix build - re-generate current.txt"
* commit '75b1c3011be727acbc862d6684299709756a33bd':
  Fix build - re-generate current.txt
2012-04-24 13:57:12 -07:00
Dirk Dougherty
53fd8e84c7 am e7c94770: am e7184552: am 93a333e3: Doc change: Add summary page of Android Developers Live videos.
* commit 'e7c94770f74887ffba0d0e7980e23869bd1b6446':
2012-04-24 13:57:01 -07:00
Dirk Dougherty
e7be6d7d32 am 74e5c926: am 91e1d4f4: am 93a333e3: Doc change: Add summary page of Android Developers Live videos.
* commit '74e5c926a54305df82562d18afa53dc7bf85d30d':
2012-04-24 13:56:59 -07:00
Joe Malin
72549639ff am 0f762466: am fdfb4d75: am 20176edc: Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1
* commit '0f762466e4548b505049cf3a6571b61972519f0b':
2012-04-24 13:56:13 -07:00
Chris Craik
177a4bb37f Merge "Add useMinimalMemory=true test to TileBenchmark" 2012-04-24 13:55:26 -07:00
Joe Malin
e66b1da6db am c111230e: am cfab1364: am 20176edc: Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1
* commit 'c111230e7654af01ddf98a103444513d8a9e5803':
2012-04-24 13:50:43 -07:00
Dianne Hackborn
dc5f9b7530 am 0172264b: am 294374bf: am 5e542108: Merge "Remove deprecation on android:enabled attribute."
* commit '0172264bda0b3b018815cb4cdf26b00ccb7d7fe5':
  Remove deprecation on android:enabled attribute.
2012-04-24 13:50:24 -07:00
Dianne Hackborn
d6bdbb8da1 am b4781b9b: am ea8ceca8: am 90577af7: Merge "use utf8_length() instead of local function, isValidUtf8()"
* commit 'b4781b9b489bc8b0049e1e92b7ab00e32b02b12c':
  use utf8_length() instead of local function, isValidUtf8()
2012-04-24 13:50:21 -07:00
Dianne Hackborn
3521a71479 am 79511838: (-s ours) am ec96305e: am 559167f3: Merge "Volume Overlay Bug When swapping streams"
* commit '79511838f94c38f92215173c18f3e17da61a8f5d':
  Volume Overlay Bug When swapping streams
2012-04-24 13:50:14 -07:00
Steve Block
3aa800b9f9 Add tests for reflection and improve JavaDoc for Java Bridge
Bug: 5461416
Change-Id: Ic339b97a9424d8848f8afd47ba00cbbee4d60c9d
2012-04-24 21:34:42 +01:00
Chris Wren
ab3333dcab Merge "Don't allow children of a SizeAdaptiveLayout to measure outside their declared range of valid sizes." 2012-04-24 13:16:05 -07:00
Chris Wren
54dfa5d90e Don't allow children of a SizeAdaptiveLayout to measure outside their declared range of valid sizes.
Bug: 6377749
Change-Id: Ie706006eee9c0ed8dda468212a652941b8e20be0
2012-04-24 16:14:31 -04:00
Jeff Sharkey
ce5a597e66 Merge "Disable READ_EXTERNAL enforcement until API level cut." 2012-04-24 13:10:32 -07:00
Jeff Sharkey
d776f617f5 Disable READ_EXTERNAL enforcement until API level cut.
Bug: 6389556
Change-Id: I78238b9de24c1b8ebb4fdc35d8aafd2e85a4adfe
2012-04-24 13:09:13 -07:00
Eric Fischer
90041f0416 Merge "Import translations. DO NOT MERGE" 2012-04-24 13:06:06 -07:00
Eric Fischer
3cfb680afe Merge "Import translations. DO NOT MERGE" 2012-04-24 13:05:29 -07:00
Eric Fischer
d671a43887 Import translations. DO NOT MERGE
Change-Id: Ib2edd737c39db1a06e846d3863cbc52eab2777ab
2012-04-24 12:49:19 -07:00
Eric Fischer
5d5440abeb Import translations. DO NOT MERGE
Change-Id: I256639001505523434884de60d949295152ed10d
2012-04-24 12:39:18 -07:00
Philip Milne
b2b15716d8 Merge "Promote layout debugging code from GridLayout to ViewGroup." 2012-04-24 11:36:54 -07:00
Gilles Debunne
0b7d747e90 Merge "Editor uses a SpanWatcher to track EasyEditSpans" 2012-04-24 11:27:32 -07:00
Chris Wren
db41553eaf Merge "actions on notifications should stack vertically." 2012-04-24 11:19:30 -07:00
Chris Wren
78db1064a7 actions on notifications should stack vertically.
Bug: 6317471
Change-Id: Ic49b7c3c95dd5033b380655fb5671433b13959ac
2012-04-24 14:15:41 -04:00
Glenn Kasten
df3ab4ab3d Merge "Scheduling policy service" 2012-04-24 11:02:55 -07:00
Craig Mautner
69c1a571ac Merge "Various debugging enhancements." 2012-04-24 10:08:34 -07:00
Craig Mautner
4d9251bb3e Merge "Fix visual glitch in app transition." 2012-04-24 10:02:38 -07:00
Craig Mautner
fbf378c736 Various debugging enhancements.
Also moved DummyAnimation into AppWindowAnimator where it belongs.

Change-Id: I7da254a8b99030b898e2ff8d983500d7ce0b2b65
2012-04-24 09:56:59 -07:00
Robert Greenwalt
c217f4cfd7 Merge "Allow quoted strings from NativeDaemonConnector" 2012-04-24 09:55:02 -07:00
Glenn Kasten
07b0465095 Scheduling policy service
Change-Id: I6178b96896ffbb3323210f93784a65d724a3e694
2012-04-24 09:53:14 -07:00