Nick Pelly
1f5badc1cb
Add NdefMessage.getByteLength(), and more minor fixes:
...
Remove NdefMessage from dispatch(). It's already in the Tag.
/*package*/ cleanup
Fix sitemap after removal of NFCDemo
Change-Id: Ie1f6d9ea98144aa97f56bb709a33f5d0ef916e8b
2012-01-26 14:21:19 -08:00
Scott Main
7e4ef61732
am 2de74f5f: am 6c055bbd: docs: add action bar icons ZIP
...
* commit '2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
docs: add action bar icons ZIP
2012-01-26 11:47:35 -08:00
Scott Main
2de74f5fa9
am 6c055bbd: docs: add action bar icons ZIP
...
* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
docs: add action bar icons ZIP
2012-01-26 11:44:58 -08:00
Scott Main
6c055bbdf4
docs: add action bar icons ZIP
...
Change-Id: Id38d82655d6bcc468890a4db93a19ac4e385db13
2012-01-26 11:35:20 -08:00
Ben Cheng
f429ff7077
Merge "Preserve NEON callee-save registers d8-d15."
2012-01-26 11:16:59 -08:00
Ben Cheng
44094486b0
Preserve NEON callee-save registers d8-d15.
...
BUG:5918479
Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
2012-01-26 10:34:52 -08:00
Scott Main
9413752f30
am e7ffc5a6: am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
...
* commit 'e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23':
docs: remove the 1.0 icon template pack
2012-01-25 18:03:20 -08:00
Scott Main
e7ffc5a633
am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
...
* commit '9ac4dd828065410efbb380992d996c7e93daf437':
docs: remove the 1.0 icon template pack
2012-01-25 18:00:42 -08:00
Scott Main
9ac4dd8280
Merge "docs: remove the 1.0 icon template pack" into ics-mr1
2012-01-25 17:58:54 -08:00
Scott Main
8a89e93ba4
am 1f9026ca: am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
...
* commit '1f9026caf1af0f7d3eb9de81641ac290fd340b4b':
docs: remove ADL presentation PDFs to conserve site space
2012-01-25 17:54:48 -08:00
Scott Main
3fe452906d
docs: remove the 1.0 icon template pack
...
Change-Id: Ia73426f67b95bc3c5aa39150a6518ee28a215b42
2012-01-25 17:54:28 -08:00
Scott Main
1f9026caf1
am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
...
* commit 'f466db14ec32fbaf08a868df40f7685a7e7df3db':
docs: remove ADL presentation PDFs to conserve site space
2012-01-25 17:52:08 -08:00
Scott Main
f466db14ec
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
2012-01-25 17:50:20 -08:00
Scott Main
948eb9b29e
docs: remove ADL presentation PDFs to conserve site space
...
Change-Id: Ie606dc02943eb27a318b183b8ebd7201e3ee38bb
2012-01-25 17:47:46 -08:00
Joe Malin
bf80175cca
am ba8dd79f: am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
...
* commit 'ba8dd79f4eb690fc7922fc4c9b0507d901a2d320':
DOC CHANGE: New Content Provider topics
2012-01-25 17:33:06 -08:00
Joe Malin
ba8dd79f4e
am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
...
* commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
DOC CHANGE: New Content Provider topics
2012-01-25 17:30:13 -08:00
Joe Malin
9f426604e6
am a2a46f62: DOC CHANGE: New Content Provider topics
...
* commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
DOC CHANGE: New Content Provider topics
2012-01-25 17:27:46 -08:00
Svetoslav Ganov
758d97c312
Merge "Fixing failing focus tests"
2012-01-25 17:09:54 -08:00
Svetoslav Ganov
36a561b4ee
Fixing failing focus tests
...
Change-Id: I3df6a72f6340cbf2e42ce4913e28471e9358088b
2012-01-25 17:05:04 -08:00
Teng-Hui Zhu
99b46be97b
Merge "Make sure WebView get notified before the EGL context destroyed."
2012-01-25 16:53:05 -08:00
Dianne Hackborn
52da22f273
Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
2012-01-25 16:15:43 -08:00
Teng-Hui Zhu
a34eb91a20
Make sure WebView get notified before the EGL context destroyed.
...
bug:5639899
Change-Id: Id778cf3dac1d2f6d6b8014b7a911b51dc14fcc8a
2012-01-25 15:23:59 -08:00
Dianne Hackborn
d96e3dfa02
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
...
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
2012-01-25 15:14:50 -08:00
Gilles Debunne
3f696b264e
Merge "Unbalanced batch edit begin and end leave TextView unresponsive"
2012-01-25 15:08:29 -08:00
Fabrice Di Meglio
842e379074
Merge "Update Javadoc for InputConnection.deleteSurroundingText()"
2012-01-25 14:52:40 -08:00
Gilles Debunne
c6854d43fc
Merge "TextView's display list updated on layout"
2012-01-25 14:07:08 -08:00
Wink Saville
b675f516da
Merge "Add additional debug"
2012-01-25 14:04:59 -08:00
Wink Saville
c7d7eafb66
Add additional debug
...
When ConnectivityService#startUsingNetworkFeature is called and the
special network is not available output some additional information.
Change-Id: I34b226a208596fa6418f1f37a0feec1d274d493c
2012-01-25 13:47:54 -08:00
Wink Saville
556f0dba10
Merge "Fix ClassCastException"
2012-01-25 13:45:02 -08:00
Fabrice Di Meglio
39d23bddef
Update Javadoc for InputConnection.deleteSurroundingText()
...
- give more precision about how the text is considered
Change-Id: Ie2f09bb3338e7dc0e98da0595d1500a6352d09d3
2012-01-25 13:40:27 -08:00
Nick Pelly
c97a552023
Improve NDEF API's
...
o Add NdefRecord.toMimeType()
Maps the record to a MIME type
o Add NdefRecord.toUri()
Maps the record to a URI
o Add hidden NfcAdapter.dispatch()
Helps test the dispatch path.
o Modify createMime(), createUri() and createExternal():
Do not try and strictly follow RFC requirements for URI or MIME content
types. This just leads to heartbreak - the RFC requirements are too strict.
For example RFC1341 forbids the use of '.' in a MIME type, however this is in
common use in types such as "application/vnd.companyname". I think the best
approach is to only remove 'obvious' whitespace issues, and to convert
uppercase to lowercase as per Android guidelines.
Change-Id: Id686f5f3b05b2dceafad48e1cfcbdb2b3890b854
2012-01-25 13:17:19 -08:00
Nick Pelly
dc828acd5f
Merge "Add API's for normalizing MIME's and URI's."
2012-01-25 12:55:58 -08:00
Wink Saville
b2bf3350a2
Fix ClassCastException
...
In "Change I95ed2aae: Stop using shared DUN APN when tethering stops",
sha1: 8beff9586ff89a1e59469e9820fd9e9d704300d2, an assumption is made
that the msg.obj is always an ApnContext, this is not true for CDMA.
Eventually we plan on removing the destinction between GSM and CDMA but
for now we need to handle it handle it.
Bug: 5904734
Change-Id: I86873dc7aeda5234c14a6fe1e4ec7345ee30e957
2012-01-25 12:42:51 -08:00
Dianne Hackborn
43ea4e10dc
Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs."
2012-01-25 12:29:17 -08:00
Gilles Debunne
954325ed26
TextView's display list updated on layout
...
Bug 5903021
We need to invalidate the DL at anytime the layout is changed.
Change-Id: Ief06c988b88cdf1b35fe8ce9bac1243326ea44c4
2012-01-25 11:57:09 -08:00
Jeff Brown
56965f97b3
Merge "Fix an inconsistent comment."
2012-01-25 11:52:48 -08:00
Robert Greenwalt
01e78a60a4
am 10953351: am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
...
* commit '109533519153307b10e2b3ae327ca4b4cd0c75d3':
Filter our v6 address from tethering dns.
2012-01-25 11:33:14 -08:00
Robert Greenwalt
1095335191
am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
...
* commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2':
Filter our v6 address from tethering dns.
2012-01-25 11:30:39 -08:00
Robert Greenwalt
44f64c9657
Merge "Filter our v6 address from tethering dns." into ics-mr1
2012-01-25 11:28:30 -08:00
Dianne Hackborn
81e9276a47
Added JELLY_BEAN version name; update some targetSdkVersion docs.
...
Change-Id: Ia38ff5b9ad2b63c2cf667260881222d9ff168052
2012-01-25 11:16:57 -08:00
Jeff Brown
ebc016c01e
Fix an inconsistent comment.
...
Change-Id: Iae40dfcca091c9886a05e483f51596c96014e57f
2012-01-25 10:43:04 -08:00
Jean-Baptiste Queru
61bd33968f
am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
...
* commit '95306d85005f165e10a25ad45cadadec6e1f6a31':
stagefright aacenc: Fix type definitions for 64 bit platforms
2012-01-25 10:33:42 -08:00
Jean-Baptiste Queru
95306d8500
am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
...
* commit '64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
stagefright aacenc: Fix type definitions for 64 bit platforms
2012-01-25 10:30:31 -08:00
Jean-Baptiste Queru
64085d03ef
am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
...
* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
stagefright aacenc: Fix type definitions for 64 bit platforms
2012-01-25 10:27:41 -08:00
Jean-Michel Trivi
171070d25e
Merge "Update AudioTrack.stop() javadoc"
2012-01-25 09:46:01 -08:00
Jean-Baptiste Queru
12045502c4
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
2012-01-25 09:17:46 -08:00
Roman Nurik
00c3aaa235
am 92aaf243: am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1
...
* commit '92aaf2431ccb8d5ef1eb456646742c736fa70266':
docs: Android Design typo and grammar fixes
2012-01-25 08:57:45 -08:00
Jean-Baptiste Queru
d452520464
am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
...
* commit 'e2594b85093441e03150c7cfc540abc626884eaf':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
2012-01-25 08:57:36 -08:00
Jean-Baptiste Queru
28091796a6
am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
...
* commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9':
stagefright aacenc: Add missing newlines at the end of files
2012-01-25 08:57:32 -08:00
Daniel Sandler
efbf376afd
am 416a1c1a: am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
...
* commit '416a1c1ada0ad553613eb439823a68d3f51b1579':
Stop showing "No internet connection" when there is one.
2012-01-25 08:57:27 -08:00