Wink Saville
b20191867e
Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
2011-05-15 14:39:16 -07:00
Wink Saville
079aa0daf8
Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
2011-05-15 14:38:59 -07:00
Robert Greenwalt
c6c91b9f21
am a71a81b6: am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
...
* commit 'a71a81b69a6e5757ff29f083783a4b704b6a9ae9':
Fix bevhavior of fetchDunApn.
2011-05-15 08:14:17 -07:00
Robert Greenwalt
37f8fca868
am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
...
* commit '9713e3c60def9d755ae828d389fced4793a3c86a':
Fix bevhavior of fetchDunApn.
2011-05-15 08:03:46 -07:00
Robert Greenwalt
22f76d0082
Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
2011-05-15 07:53:50 -07:00
Wink Saville
2ed31d62b0
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.
2011-05-14 07:50:40 -07:00
Wink Saville
ac0abc1a61
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.
2011-05-14 07:43:00 -07:00
Wink Saville
97f87eb6a8
Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
2011-05-14 07:35:21 -07:00
Scott Main
456fc72b8f
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
2011-05-13 20:37:02 -07:00
Scott Main
d1f60e04d7
am 3cd61e2b: am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit '3cd61e2bca2df05a9ad3679c7456b077f2d04f2b':
docs: update homepage I/O announcement
2011-05-13 20:34:11 -07:00
Scott Main
6c344c7803
am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit '084d3490a5283088426058d3c15532b176367926':
docs: update homepage I/O announcement
2011-05-13 20:32:32 -07:00
Scott Main
3fce43da30
am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit 'f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
docs: update homepage I/O announcement
2011-05-13 20:29:45 -07:00
Scott Main
ebbc478d9b
Merge "docs: update homepage I/O announcement" into honeycomb-mr1
2011-05-13 20:26:56 -07:00
Jeff Sharkey
493fec98c5
Merge "Add Socket tagging for granular data accounting."
2011-05-13 18:51:36 -07:00
Dianne Hackborn
73e9a4aa9d
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.
2011-05-13 18:43:14 -07:00
Dianne Hackborn
ade8cd9080
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.
2011-05-13 18:41:04 -07:00
Dianne Hackborn
923d3e4e36
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.
2011-05-13 18:39:01 -07:00
Xavier Ducrohet
ac6a322e24
am d0054160: am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit 'd00541603fbbb4e38264e75a2b6abf8705efeb49':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:43:37 -07:00
Xavier Ducrohet
b35013083f
am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit '6d040a7f20de29a9667dd81bd4de40a9e56fd341':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:36:16 -07:00
Xavier Ducrohet
a20e479072
am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit '738c5e6072459c772064c96233cf59639bbfe2fd':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:32:47 -07:00
Dianne Hackborn
0df7819b21
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.
2011-05-13 16:32:00 -07:00
James Dong
67f1848563
Merge "Add support for platform-specific recording start time offset"
2011-05-13 16:31:10 -07:00
Xavier Ducrohet
0c36d14f6b
am 2fae858d: LayoutLib: implement data binding for most AdapterView
...
* commit '2fae858db55fc6984ef923a6226b9408c37c72cb':
LayoutLib: implement data binding for most AdapterView
2011-05-13 16:30:44 -07:00
James Dong
aae42acad5
Merge "Support for storing geo information in the recorded mp4/3gpp file."
2011-05-13 16:30:16 -07:00
Dianne Hackborn
7f1489bc4b
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.
2011-05-13 16:29:40 -07:00
Dianne Hackborn
e50994f021
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.
2011-05-13 16:26:44 -07:00
Dianne Hackborn
bd2fecd927
Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
2011-05-13 16:24:32 -07:00
Dianne Hackborn
b64f3ce65d
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
2011-05-13 15:48:02 -07:00
Dianne Hackborn
ac26a1fcc2
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
2011-05-13 15:45:23 -07:00
Christopher Tate
21a357e114
Merge "Full backup tweaks"
2011-05-13 15:41:32 -07:00
Christopher Tate
b41c5a5ae7
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
2011-05-13 15:38:02 -07:00
Dianne Hackborn
d26eaf683d
am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
...
* commit 'f3f2d731e19bb47a87dc071a5750fc0f18248da2':
DO NOT MERGE. Integrate fragment work from master
2011-05-13 15:36:48 -07:00
Dianne Hackborn
a15868e6cb
Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
2011-05-13 15:33:21 -07:00
Jeff Brown
dd7209128c
am 0d9288d7: am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945
...
* commit '0d9288d7848e144fdf7afbd7284254dae3d13d43':
Fix bounds check. Bug: 4413945
2011-05-13 15:22:35 -07:00
Dianne Hackborn
62734c9b31
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.
2011-05-13 15:22:30 -07:00
Scott Main
4e57f41bb3
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
2011-05-13 15:22:27 -07:00
Scott Main
7aee6f5eed
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
2011-05-13 15:22:12 -07:00
Wink Saville
3076eadcbe
Merge "resolved conflicts for merge of 74af525e to master"
2011-05-13 15:10:08 -07:00
Romain Guy
e1d02c3836
Merge "Remove useless code."
2011-05-13 14:50:06 -07:00
Svetoslav Ganov
059595733f
Merge "Factored out the Accessibility vertical initialization."
2011-05-13 14:19:17 -07:00
Gloria Wang
c083b16c76
Merge "Add one more DRM error code. For bug 4422428."
2011-05-13 14:02:50 -07:00
Wink Saville
c5db445534
resolved conflicts for merge of 74af525e to master
...
Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d
2011-05-13 14:01:16 -07:00
Jeff Brown
292eebb698
am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945
...
* commit '2bdb756cdfc5e5d19e1621ae4a603b27963d6a5c':
Fix bounds check. Bug: 4413945
2011-05-13 13:07:44 -07:00
Jeff Brown
b7341bf80c
am 4fb76253: Fix bounds check. Bug: 4413945
...
* commit '4fb76253f255f0adb8a64835af37bb9176ee4016':
Fix bounds check. Bug: 4413945
2011-05-13 13:04:28 -07:00
Jeff Brown
282cdfb6f4
Merge "Add initial API for stylus and mouse buttons."
2011-05-13 12:14:27 -07:00
Jeff Brown
e959ed2533
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
2011-05-13 12:11:17 -07:00
Dianne Hackborn
0198149921
Merge "resolved conflicts for merge of ec85619f to master"
2011-05-13 12:06:45 -07:00
Romain Guy
721e042a6b
Merge "Fix waaayyy too many documentation links."
2011-05-13 11:50:06 -07:00
Dianne Hackborn
89178d4de2
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.
2011-05-13 11:21:26 -07:00
Dianne Hackborn
ed49d546d1
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.
2011-05-13 11:18:40 -07:00