OSDN Git Service
Gilles Debunne [Mon, 16 May 2011 18:14:41 +0000 (11:14 -0700)]
Merge "Links in Environment javadoc"
Dianne Hackborn [Mon, 16 May 2011 18:12:45 +0000 (11:12 -0700)]
am
fbdf9df0: (-s ours) am
2a20583a: am
700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
* commit '
fbdf9df053800afb25453630d11bd48cbc068271':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
Dirk Dougherty [Mon, 16 May 2011 18:10:18 +0000 (11:10 -0700)]
am
b131d288: am
4bfc1cc0: am
8b8bfc5d: am
babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit '
b131d288f2c90daf95c678ad12c9708082a2977a':
Doc change: typo fix
Scott Main [Mon, 16 May 2011 18:10:15 +0000 (11:10 -0700)]
am
833b325f: am
81dd428d: am
582c1361: am
5eba0e98: docs: update featured videos and increase the max results for each playlist
* commit '
833b325f5a22f88c1ab84eef5b8caf79cd292036':
docs: update featured videos and increase the max results for each playlist
Dianne Hackborn [Mon, 16 May 2011 18:09:31 +0000 (11:09 -0700)]
am
2a20583a: am
700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
* commit '
2a20583a5f436d66ab73cd6c0fdc73e59a3cecad':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
Dirk Dougherty [Mon, 16 May 2011 18:07:02 +0000 (11:07 -0700)]
am
4bfc1cc0: am
8b8bfc5d: am
babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit '
4bfc1cc0a9bea7d7529b6c92daeb65660961b7d4':
Doc change: typo fix
Scott Main [Mon, 16 May 2011 18:06:59 +0000 (11:06 -0700)]
am
81dd428d: am
582c1361: am
5eba0e98: docs: update featured videos and increase the max results for each playlist
* commit '
81dd428d70ae14dcceae3bab5271d726abf2f324':
docs: update featured videos and increase the max results for each playlist
Dianne Hackborn [Mon, 16 May 2011 18:06:28 +0000 (11:06 -0700)]
am
700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
* commit '
700ab1c75862babba90f54e02bdc877becd4f4fc':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
Dirk Dougherty [Mon, 16 May 2011 18:03:56 +0000 (11:03 -0700)]
am
8b8bfc5d: am
babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit '
8b8bfc5d28d9746bf30b2de45f879d9481b07d6f':
Doc change: typo fix
Scott Main [Mon, 16 May 2011 18:03:53 +0000 (11:03 -0700)]
am
582c1361: am
5eba0e98: docs: update featured videos and increase the max results for each playlist
* commit '
582c1361e8a6443812a97f18094be1f8279645a0':
docs: update featured videos and increase the max results for each playlist
Dianne Hackborn [Mon, 16 May 2011 18:02:29 +0000 (11:02 -0700)]
Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
Dirk Dougherty [Mon, 16 May 2011 18:01:44 +0000 (11:01 -0700)]
am
babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit '
babf844f4606f07de0e3349b5847faa2f8f208cc':
Doc change: typo fix
Scott Main [Mon, 16 May 2011 18:01:42 +0000 (11:01 -0700)]
am
5eba0e98: docs: update featured videos and increase the max results for each playlist
* commit '
5eba0e98d1f7ed8f9d04a44adb8d8a37ef7f4659':
docs: update featured videos and increase the max results for each playlist
Fabrice Di Meglio [Mon, 16 May 2011 18:00:02 +0000 (11:00 -0700)]
Merge "Fix bug #
4415576 Gmail text looks broken"
Dirk Dougherty [Mon, 16 May 2011 17:59:00 +0000 (10:59 -0700)]
Merge "Doc change: typo fix" into honeycomb-mr1
Andreas Huber [Mon, 16 May 2011 17:47:50 +0000 (10:47 -0700)]
Merge "Fix module tags on stagefright software decoders."
James Dong [Mon, 16 May 2011 17:46:33 +0000 (10:46 -0700)]
Merge "Support platform and camera dependent recording start time offset"
Scott Main [Mon, 16 May 2011 17:40:56 +0000 (10:40 -0700)]
am
8e3fdf81: am
fa5a08be: am
1ff0131e: am
fc0ea7ea: docs: add oem driver for alcatel
* commit '
8e3fdf812b7684727d69b7326a02d7fdf8472e3f':
docs: add oem driver for alcatel
Scott Main [Mon, 16 May 2011 17:37:33 +0000 (10:37 -0700)]
am
fa5a08be: am
1ff0131e: am
fc0ea7ea: docs: add oem driver for alcatel
* commit '
fa5a08beed19f05b1946db55bd3ff9c13600f9f4':
docs: add oem driver for alcatel
Scott Main [Mon, 16 May 2011 17:24:28 +0000 (10:24 -0700)]
am
1ff0131e: am
fc0ea7ea: docs: add oem driver for alcatel
* commit '
1ff0131e77e625af3100720a3552dc1f4064421d':
docs: add oem driver for alcatel
Scott Main [Mon, 16 May 2011 17:20:59 +0000 (10:20 -0700)]
am
fc0ea7ea: docs: add oem driver for alcatel
* commit '
fc0ea7ea5de429d9eea7f13bca42b98081d38dc5':
docs: add oem driver for alcatel
Wink Saville [Sun, 15 May 2011 21:47:45 +0000 (14:47 -0700)]
am
7a2a87d6: am
a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
* commit '
7a2a87d6457885c5d3d4dbf335be101aa9c5c3ab':
Support for Vendor RIL dump of baseband logs
Wink Saville [Sun, 15 May 2011 21:47:42 +0000 (14:47 -0700)]
am
58779700: am
92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
* commit '
58779700df18d52edf1102c6fcb3731f28d37a94':
Telephony: Handle Icc Status Changed Event.
Wink Saville [Sun, 15 May 2011 21:43:52 +0000 (14:43 -0700)]
am
a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
* commit '
a1c29d30f342c2d3dbf7022f1b130934c2519b81':
Support for Vendor RIL dump of baseband logs
Wink Saville [Sun, 15 May 2011 21:43:49 +0000 (14:43 -0700)]
am
92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
* commit '
92cc1d20ae0e3dc7e0618027967145e26c1cb6e2':
Telephony: Handle Icc Status Changed Event.
Wink Saville [Sun, 15 May 2011 21:39:16 +0000 (14:39 -0700)]
Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
Wink Saville [Sun, 15 May 2011 21:38:59 +0000 (14:38 -0700)]
Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
Robert Greenwalt [Sun, 15 May 2011 15:14:17 +0000 (08:14 -0700)]
am
a71a81b6: am
9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
* commit '
a71a81b69a6e5757ff29f083783a4b704b6a9ae9':
Fix bevhavior of fetchDunApn.
Robert Greenwalt [Sun, 15 May 2011 15:03:46 +0000 (08:03 -0700)]
am
9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
* commit '
9713e3c60def9d755ae828d389fced4793a3c86a':
Fix bevhavior of fetchDunApn.
Robert Greenwalt [Sun, 15 May 2011 14:53:50 +0000 (07:53 -0700)]
Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
Wink Saville [Sat, 14 May 2011 14:50:40 +0000 (07:50 -0700)]
am
d0903e14: am
6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
* commit '
d0903e1478c7ba2fb8087f1bae1fba69791039ba':
TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
Wink Saville [Sat, 14 May 2011 14:43:00 +0000 (07:43 -0700)]
am
6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
* commit '
6e41b32dd08a866cb7158b387646e96c9105831b':
TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
Wink Saville [Sat, 14 May 2011 14:35:21 +0000 (07:35 -0700)]
Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
Scott Main [Sat, 14 May 2011 03:37:02 +0000 (20:37 -0700)]
am
ebb7d863: am
3cd61e2b: am
084d3490: am
f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '
ebb7d8630cc9a13563fe7fc36a6f00a8924085b8':
docs: update homepage I/O announcement
Scott Main [Sat, 14 May 2011 03:34:11 +0000 (20:34 -0700)]
am
3cd61e2b: am
084d3490: am
f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '
3cd61e2bca2df05a9ad3679c7456b077f2d04f2b':
docs: update homepage I/O announcement
Scott Main [Sat, 14 May 2011 03:32:32 +0000 (20:32 -0700)]
am
084d3490: am
f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '
084d3490a5283088426058d3c15532b176367926':
docs: update homepage I/O announcement
Scott Main [Sat, 14 May 2011 03:29:45 +0000 (20:29 -0700)]
am
f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '
f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
docs: update homepage I/O announcement
Scott Main [Sat, 14 May 2011 03:26:56 +0000 (20:26 -0700)]
Merge "docs: update homepage I/O announcement" into honeycomb-mr1
Jeff Sharkey [Sat, 14 May 2011 01:51:36 +0000 (18:51 -0700)]
Merge "Add Socket tagging for granular data accounting."
Dianne Hackborn [Sat, 14 May 2011 01:43:14 +0000 (18:43 -0700)]
am
24df0757: (-s ours) am
ed9321ab: am
f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
* commit '
24df0757f86851569b65dadd0dfa139521748b9c':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
Dianne Hackborn [Sat, 14 May 2011 01:41:04 +0000 (18:41 -0700)]
am
ed9321ab: am
f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
* commit '
ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
Dianne Hackborn [Sat, 14 May 2011 01:39:01 +0000 (18:39 -0700)]
am
f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
* commit '
f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
Xavier Ducrohet [Fri, 13 May 2011 23:43:37 +0000 (16:43 -0700)]
am
d0054160: am
6d040a7f: am
738c5e60: am
2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '
d00541603fbbb4e38264e75a2b6abf8705efeb49':
LayoutLib: implement data binding for most AdapterView
Xavier Ducrohet [Fri, 13 May 2011 23:36:16 +0000 (16:36 -0700)]
am
6d040a7f: am
738c5e60: am
2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '
6d040a7f20de29a9667dd81bd4de40a9e56fd341':
LayoutLib: implement data binding for most AdapterView
Xavier Ducrohet [Fri, 13 May 2011 23:32:47 +0000 (16:32 -0700)]
am
738c5e60: am
2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '
738c5e6072459c772064c96233cf59639bbfe2fd':
LayoutLib: implement data binding for most AdapterView
Dianne Hackborn [Fri, 13 May 2011 23:32:00 +0000 (16:32 -0700)]
am
71da3207: am
7d87c37b: am
6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
* commit '
71da32074ce729fe170de2d6c348b110fb6625cc':
Fix a bug where an action bar could be created when it should not be.
James Dong [Fri, 13 May 2011 23:31:10 +0000 (16:31 -0700)]
Merge "Add support for platform-specific recording start time offset"
Xavier Ducrohet [Fri, 13 May 2011 23:30:44 +0000 (16:30 -0700)]
am
2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '
2fae858db55fc6984ef923a6226b9408c37c72cb':
LayoutLib: implement data binding for most AdapterView
James Dong [Fri, 13 May 2011 23:30:16 +0000 (16:30 -0700)]
Merge "Support for storing geo information in the recorded mp4/3gpp file."
Dianne Hackborn [Fri, 13 May 2011 23:29:40 +0000 (16:29 -0700)]
am
7d87c37b: am
6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
* commit '
7d87c37b031616259d1db6a78ecb1ff20ee5ff5c':
Fix a bug where an action bar could be created when it should not be.
Dianne Hackborn [Fri, 13 May 2011 23:26:44 +0000 (16:26 -0700)]
am
6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
* commit '
6121f06ed5847d1edd22b23c3b28bf3b3e3af602':
Fix a bug where an action bar could be created when it should not be.
Dianne Hackborn [Fri, 13 May 2011 23:24:32 +0000 (16:24 -0700)]
Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
Dianne Hackborn [Fri, 13 May 2011 22:48:02 +0000 (15:48 -0700)]
am
28a8bce6: (-s ours) am
6824c135: am
f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
* commit '
28a8bce691358dca3872e65d3604f3b0ff3fccaf':
DO NOT MERGE. Integrate fragment work from master
Dianne Hackborn [Fri, 13 May 2011 22:45:23 +0000 (15:45 -0700)]
am
6824c135: am
f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
* commit '
6824c135fe9639c74f38f125d678c20065c3347c':
DO NOT MERGE. Integrate fragment work from master
Christopher Tate [Fri, 13 May 2011 22:41:32 +0000 (15:41 -0700)]
Merge "Full backup tweaks"
Christopher Tate [Fri, 13 May 2011 22:38:02 +0000 (15:38 -0700)]
Full backup tweaks
* provide placeholder UI showing backup/restore start/stop/timeout
* don't kill the progress UI in mid stream
* tidy up the pax extended header data writing a little
Change-Id: Ife0cb78e3facb541d8327f1d5ca5fe77faa6cbca
Dianne Hackborn [Fri, 13 May 2011 22:36:48 +0000 (15:36 -0700)]
am
f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
* commit '
f3f2d731e19bb47a87dc071a5750fc0f18248da2':
DO NOT MERGE. Integrate fragment work from master
Dianne Hackborn [Fri, 13 May 2011 22:33:21 +0000 (15:33 -0700)]
Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
Jeff Brown [Fri, 13 May 2011 22:22:35 +0000 (15:22 -0700)]
Dianne Hackborn [Fri, 13 May 2011 22:22:30 +0000 (15:22 -0700)]
am
2e4a3236: (-s ours) am
46a282f3: am
0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '
2e4a3236a7634d17f89288e9739a438ecbea0471':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
Scott Main [Fri, 13 May 2011 22:22:27 +0000 (15:22 -0700)]
am
15f8a6a7: am
4c53fc7e: am
78b875e7: am
edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '
15f8a6a726658bfb195924bd5d7bb86684a22de0':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
Scott Main [Fri, 13 May 2011 22:22:12 +0000 (15:22 -0700)]
am
f5c82622: am
2a959725: am
d32aeafc: am
432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
* commit '
f5c826224b0c6b9edf1a892a6ffc6273401e6e27':
docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
Wink Saville [Fri, 13 May 2011 22:10:08 +0000 (15:10 -0700)]
Merge "resolved conflicts for merge of
74af525e to master"
Romain Guy [Fri, 13 May 2011 21:50:06 +0000 (14:50 -0700)]
Merge "Remove useless code."
Svetoslav Ganov [Fri, 13 May 2011 21:19:17 +0000 (14:19 -0700)]
Merge "Factored out the Accessibility vertical initialization."
Gloria Wang [Fri, 13 May 2011 21:02:50 +0000 (14:02 -0700)]
Merge "Add one more DRM error code. For bug
4422428."
Wink Saville [Fri, 13 May 2011 21:01:16 +0000 (14:01 -0700)]
resolved conflicts for merge of
74af525e to master
Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d
Jeff Brown [Fri, 13 May 2011 20:07:44 +0000 (13:07 -0700)]
am
2bdb756c: am
4fb76253: Fix bounds check. Bug:
4413945
* commit '
2bdb756cdfc5e5d19e1621ae4a603b27963d6a5c':
Fix bounds check. Bug:
4413945
Jeff Brown [Fri, 13 May 2011 20:04:28 +0000 (13:04 -0700)]
am
4fb76253: Fix bounds check. Bug:
4413945
* commit '
4fb76253f255f0adb8a64835af37bb9176ee4016':
Fix bounds check. Bug:
4413945
Jeff Brown [Fri, 13 May 2011 19:14:27 +0000 (12:14 -0700)]
Merge "Add initial API for stylus and mouse buttons."
Jeff Brown [Sat, 7 May 2011 01:20:01 +0000 (18:20 -0700)]
Add initial API for stylus and mouse buttons.
Added the concept of pointer properties in a MotionEvent.
This is currently used to track the pointer tool type to enable
applications to distinguish finger touches from a stylus.
Button states are also reported to application as part of touch events.
There are no new actions for detecting changes in button states.
The application should instead query the button state from the
MotionEvent and take appropriate action as needed.
A good time to check the button state is on ACTION_DOWN.
As a side-effect, applications that do not support multiple buttons
will treat primary, secondary and tertiary buttons identically
for all touch events.
The back button on the mouse is mapped to KEYCODE_BACK
and the forward button is mapped to KEYCODE_FORWARD.
Added basic plumbing for the secondary mouse button to invoke
the context menu, particularly in lists.
Added clamp and split methods on MotionEvent to take care of
common filtering operations so we don't have them scattered
in multiple places across the framework.
Bug:
4260011
Change-Id: Ie992b4d4e00c8f2e76b961da0a902145b27f6d83
Dianne Hackborn [Fri, 13 May 2011 19:06:45 +0000 (12:06 -0700)]
Merge "resolved conflicts for merge of
ec85619f to master"
Romain Guy [Fri, 13 May 2011 18:50:06 +0000 (11:50 -0700)]
Merge "Fix waaayyy too many documentation links."
Dianne Hackborn [Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)]
am
46a282f3: am
0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '
46a282f323bc05606e4fe1eba795bd9ac7c99819':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
Dianne Hackborn [Fri, 13 May 2011 18:18:40 +0000 (11:18 -0700)]
am
0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '
0ed2e845db3f6bc7bc12a08ada18363942c2fb3d':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
Dianne Hackborn [Fri, 13 May 2011 18:16:42 +0000 (11:16 -0700)]
Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
Guang Zhu [Fri, 13 May 2011 18:12:48 +0000 (11:12 -0700)]
Merge "even more logging"
Fabrice Di Meglio [Fri, 13 May 2011 18:09:19 +0000 (11:09 -0700)]
Merge "Prepare OpenGLRenderer to use glyphs from TextLayoutCache"
Scott Main [Fri, 13 May 2011 18:03:27 +0000 (11:03 -0700)]
am
4c53fc7e: am
78b875e7: am
edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '
4c53fc7ec921c0959f021a475fe0d91b7e6ddc2d':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
Scott Main [Fri, 13 May 2011 18:01:25 +0000 (11:01 -0700)]
am
2a959725: am
d32aeafc: am
432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
* commit '
2a959725f569147878b3a78fae77e8679c8e16fa':
docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
Scott Main [Fri, 13 May 2011 18:00:27 +0000 (11:00 -0700)]
am
78b875e7: am
edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '
78b875e7e65ee90e44872d6542c5eb4213ba0dfb':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
Scott Main [Fri, 13 May 2011 17:58:29 +0000 (10:58 -0700)]
am
d32aeafc: am
432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
* commit '
d32aeafc41b018b7efbddd1b90e17424bf1cf1e7':
docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
Scott Main [Fri, 13 May 2011 17:56:52 +0000 (10:56 -0700)]
am
edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '
edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
Scott Main [Fri, 13 May 2011 17:55:09 +0000 (10:55 -0700)]
am
432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
* commit '
432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
Scott Main [Fri, 13 May 2011 17:54:00 +0000 (10:54 -0700)]
Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
Eric Laurent [Fri, 13 May 2011 17:24:24 +0000 (10:24 -0700)]
Merge "Fix audio effect framework issues"
Alex Sakhartchouk [Fri, 13 May 2011 17:24:19 +0000 (10:24 -0700)]
Merge "Cleanup mesh creation."
Gilles Debunne [Fri, 13 May 2011 16:41:57 +0000 (09:41 -0700)]
Merge "SuggestionSpans are preserved when picked."
Wink Saville [Fri, 13 May 2011 16:20:08 +0000 (09:20 -0700)]
am
55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE
* commit '
55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
Add getLteOnCdamMode.
Wink Saville [Fri, 13 May 2011 16:09:43 +0000 (09:09 -0700)]
Merge "Add getLteOnCdamMode." into honeycomb-LTE
Steve Block [Fri, 13 May 2011 13:44:57 +0000 (06:44 -0700)]
Merge "Fix WebCore include paths due to merge to WebKit r75315"
Dianne Hackborn [Fri, 13 May 2011 01:07:47 +0000 (18:07 -0700)]
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.
This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.
Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
Dianne Hackborn [Fri, 13 May 2011 01:25:57 +0000 (18:25 -0700)]
resolved conflicts for merge of
ec85619f to master
Change-Id: Id820ddcb9d19341a1b383b3bef7659a2c0621cfa
Christopher Tate [Fri, 13 May 2011 00:47:12 +0000 (17:47 -0700)]
Use pax extended tar format to support long filenames etc.
'tar' supports only 100-character paths; 'ustar' supports only
155+100 character prefix + paths; neither supports files larger
than about 8 gigabytes. We now use the POSIX.1-2001 'pax'
extended tar format for those files in the backup stream that
are too large or have too-long paths for the 'ustar' format.
Change-Id: I2f256823091deaec9b1ccea685d2344753c6cb67
Dianne Hackborn [Fri, 13 May 2011 00:42:14 +0000 (17:42 -0700)]
Dianne Hackborn [Fri, 13 May 2011 00:39:30 +0000 (17:39 -0700)]
am
d46849a5: am
a8138732: MR2 is going to be API 13.
* commit '
d46849a535ab64fd47fc8e9c557ca5f4da9e977b':
MR2 is going to be API 13.
Dianne Hackborn [Fri, 13 May 2011 00:39:22 +0000 (17:39 -0700)]
Irfan Sheriff [Fri, 13 May 2011 00:39:07 +0000 (17:39 -0700)]
am
91a46046: (-s ours) am
2cd423a0: Merge commit \'
01ea7f01\' into manualmerge1
* commit '
91a460469a20529938e0f740ce24e0fdaddb7fa6':
DO NOT MERGE Add DhcpStateMachine
Irfan Sheriff [Fri, 13 May 2011 00:37:06 +0000 (17:37 -0700)]
am
2cd423a0: Merge commit \'
01ea7f01\' into manualmerge1
* commit '
2cd423a049aeeb0c07f7a556f3a6f701b504606f':
DO NOT MERGE Add DhcpStateMachine
Dianne Hackborn [Fri, 13 May 2011 00:35:35 +0000 (17:35 -0700)]
am
a8138732: MR2 is going to be API 13.
* commit '
a8138732a01b92f0a40f72050b74a3bd4cf6d215':
MR2 is going to be API 13.