9460 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
c3b112ba20 Merge db2403ff from open-source master
Change-Id: I90dfa2f37db901b62690b6becbf5d0d91468672c
2010-11-05 07:53:24 -07:00
Mathias Agopian
b20c2e7ca0 am 477c4fee: Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
* commit '477c4feee2f0922dbc8952639cc12987d5cdce04':
  [3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
2010-11-03 17:59:47 -07:00
Mathias Agopian
477c4feee2 Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread 2010-11-03 17:57:32 -07:00
Kevin Powell
34884b409e [3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
Change-Id: I59cacab4c7108cfb4a17fd1021de7473e6faa74f
2010-11-03 16:35:02 -07:00
Jeff Hamilton
1212d4fdc9 am ef569469: Merge "Remove the My Tag feature." into gingerbread
* commit 'ef5694692f88bb91ed6ee1191b11a66ec594ff39':
  Remove the My Tag feature.
2010-11-03 13:37:22 -07:00
Jeff Hamilton
575a6bbfe0 Remove the My Tag feature.
Change-Id: I9167121da2fa66ddae23386d24fef7bcc64eb3f1
2010-11-03 15:32:40 -05:00
Brad Fitzpatrick
db2403ff32 Merge "Add support for UAProf header in HTTP requests" 2010-11-03 11:38:06 -07:00
Jason parks
bcbf17a582 am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
* commit '73eba2a6bcf39eb20d815517ed11e1a7fb7a2c39':
  Return a zero length byte from toByteArray instead of null.
2010-11-02 19:00:12 -07:00
Jason parks
3ebd59bb5d Return a zero length byte from toByteArray instead of null.
Change-Id: I67b388099c72a0d2ec6b429caea8f29bf8f7a75a
2010-11-02 20:03:52 -05:00
Brad Fitzpatrick
f3a6b90191 am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"
* commit '9df48a0305818122298a86ae9949f6688814928b':
  NotificationManager: droiddoc documentation improvements
2010-11-02 15:00:06 -07:00
Brad Fitzpatrick
9df48a0305 Merge "NotificationManager: droiddoc documentation improvements" 2010-11-02 14:55:21 -07:00
Nick Pelly
6fb9316f6b am 38e561dd: Merge "Remove timeout support." into gingerbread
* commit '38e561dd3cd72160035d8b3002fc9bbaf3071374':
  Remove timeout support.
2010-11-02 14:49:35 -07:00
Jean-Baptiste Queru
c91e46730d am bbd212d7: Merge "Document per-implementation behaviors of native get* methods"
* commit 'bbd212d77852be155a815a0d2ad1da0df2c0dfe1':
  Document per-implementation behaviors of native get* methods
2010-11-02 14:18:07 -07:00
Jean-Baptiste Queru
0b5d57ab7e am 715f8610: Merge "Clarify documentation of Cursor get* methods."
* commit '715f86107763ee95e7d6558dd8da390a63da63e2':
  Clarify documentation of Cursor get* methods.
2010-11-02 14:18:02 -07:00
Nick Pelly
275708c82c Remove timeout support.
The implementation was guarenteed to cause deadlock when a timeout was set.

Change-Id: I59444ea784eb9057c6c4c9e9123f558b3ef5eef6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-11-02 16:13:52 -05:00
Daniel Trebbien
adf4194458 Document per-implementation behaviors of native get* methods
Change-Id: I5d20d7796b85ce62750dd50dd79e47d76716b24c
2010-11-02 09:35:12 -07:00
Daniel Trebbien
65068b099e Clarify documentation of Cursor get* methods.
Make clear in the Javadoc comments of the `Cursor` get* methods that
implementations thereof can have implementation-defined behavior. In some cases,
these changes actually correct the documentation. For example, in the case of
`getShort` and the `SQLiteCursor` implementation thereof, non-numeric data is
*not* converted to a `short` via Short#valueOf or even in a functionally-
equivalent manner.

Change-Id: Ib2f81811a603680b52fc482eb9c0f3195447566f
2010-11-02 09:24:07 -07:00
Matthias Thomae
bdb0896ba5 Add support for UAProf header in HTTP requests
Each HTTP request sent from a mobile handset is usually required to
include a x-wap-profile header following the UAProf specification. The
value of this header is a URL that points to the location of a
document which specifies relevant capabilities of the phone, e.g.
supported network bearers, video formats or screen size. This change
defines a global string resource that holds this URL, and also adds
the necessary code in the web widget to include this header in HTTP
requests.
2010-11-02 13:26:24 +01:00
Leon Scroggins
553812178a am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbread
* commit '3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276':
  Update insertion handler for WebTextView.
2010-11-01 14:51:00 -07:00
Leon Scroggins
3073646f61 Merge "Update insertion handler for WebTextView." into gingerbread 2010-11-01 14:49:47 -07:00
Jean-Baptiste Queru
41c738849c am 5b4d0e84: Merge "TabWidget orientation"
* commit '5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630':
  TabWidget orientation
2010-11-01 13:30:49 -07:00
Jean-Baptiste Queru
5b4d0e84d3 Merge "TabWidget orientation" 2010-11-01 13:19:02 -07:00
Dianne Hackborn
ce0f9e4e4f am 42679cea: Merge "Fix issue #3152415: Various confusions in docs about Application" into gingerbread
* commit '42679cea5d8bc4b235b290b97805b86c8c7cbca5':
  Fix issue #3152415: Various confusions in docs about Application
2010-11-01 12:49:51 -07:00
Leon Scroggins
5642625cfb Update insertion handler for WebTextView.
Bug:3152629
Change-Id: If2a33eb5456493fb9b3b2c54fcc4f5348fe129e1
2010-11-01 15:45:37 -04:00
Jean-Baptiste Queru
a87cdd398f am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)."
* commit 'b1fa549a49fd8fa2fe67ee30d107cc2d1486645f':
  Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
2010-11-01 10:39:01 -07:00
Jean-Baptiste Queru
b1fa549a49 Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)." 2010-11-01 10:29:22 -07:00
Dianne Hackborn
7025d8e4b9 Fix issue #3152415: Various confusions in docs about Application
Change-Id: Ie1b480ed7a47a3eb6ffff76bef0dcd7b2b845e83
2010-11-01 09:49:37 -07:00
Romain Guy
f101a85bc3 am cee8d1d3: Merge "fix typo"
* commit 'cee8d1d3450fb2b7490fbe41bf8b3f974c015f6f':
  fix typo
2010-10-31 11:21:24 -07:00
Daniel Trebbien
0a675fd8fe Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
The Javadoc comment for class `android.content.UriMatcher` had four issues:
1. The example calls to `addURI` should not be using a leading forward slash in
   the path parameter (reported by Ester Ytterbrink).
2. The sample code to construct a `UriMatcher` was incorrect because the
   `UriMatcher` constructor takes a parameter (reported by Ross Light).
3. The code example for using `match` was incorrect because it showed two
   parameters being passed, when `match` only takes one (reported by
   Ross Light).
4. The sample `getType` implementations were incorrect because `getType` takes
   a `Uri` object, not an array of `String`s.

Change-Id: I560bff6f021c13cabf736f40ff0f47a205074291
2010-10-31 07:42:35 -07:00
Uwe Voelker
fc8daba45e fix typo
Change-Id: Ib36aabc68128d1b2b8c41b965a10be2ab2f4cd93
2010-10-31 10:08:04 +01:00
Joe Onorato
dbf9a02b0a am ed3c7be8: Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
* commit 'ed3c7be84255d48fe7f0454bdd51b3955698cafe':
  Report the new size to wallpapers when the requested size changed.
2010-10-29 08:16:20 -07:00
Nick Pelly
ba1664b34c am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
* commit '4bf4b491be3fbd0f71bb87749a0e31f817b91e08':
  Hide some NFC API's.
2010-10-29 08:15:48 -07:00
Joe Onorato
ed3c7be842 Merge "Report the new size to wallpapers when the requested size changed." into gingerbread 2010-10-28 18:18:52 -07:00
Joe Onorato
dcfae5c0fd Report the new size to wallpapers when the requested size changed.
We were telling the app, but we weren't saving the data for ourselves.
This also tells them to re-scroll when there's a new size.

Bug: 3144373
Change-Id: I9d12b714119ff02dd7d7f1cfa997d8a44475b9e9
2010-10-28 18:04:10 -07:00
Nick Pelly
4bf4b491be Merge "Hide some NFC API's." into gingerbread 2010-10-28 16:47:31 -07:00
Nick Pelly
11b075e218 Hide some NFC API's.
We are leaving enough API so that you can see when any Tag is discovered,
get its ID, and get its NDEF messages.

But for advanced use - creating tag connections and writing messages - we have
2 problems. Firstly a lot of the code is untested
(RawTagConnection.transceive()), or in some cases known not to work
(NdefTagConnection.write()). Secondly, there is still debate about how to
best expose information about Tags.

The set of data/methods exposed for a Tag changes completely depending on the
tag technology. There may be multiple sets of technology implemented in a
single tag. Tag A may have technology X and Y, Tag B may have technology Y
and Z. Furthermore, some NFC controllers will be not be able to use all
technologies, and so Android Device 1 may see technology X and Y on Tag A but
Android device 2 may only see technology X. So we have a pretty challenging
set of constraints to work under, and we are not convinced the current Tag and
NdefTag class is the best approach going forwards.

The Tag application should be able to remain unbundled, since it just needs to
get incoming NDEF Messages.

Change-Id: Ic09f094f33794e10f8d730fffe011c9a5957e0ac
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-28 14:54:52 -07:00
Jeff Hamilton
ae5ace55d9 am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
* commit 'bd8ff5b5d4f4c74889ce20a0c7a2f8e0ab7b6ea9':
  DO NOT MERGE. Fix asset file descriptor for pipe based fds.
2010-10-28 14:03:40 -07:00
Jeff Hamilton
145fe77dbf DO NOT MERGE. Fix asset file descriptor for pipe based fds.
Change-Id: Ic366d01f91017109abfcfa65bd2231dd7416ce71
2010-10-28 15:05:27 -05:00
Jaikumar Ganesh
70a68f9544 am 025f78eb: Merge "DO NOT MERGE Fix auto connection with headsets which don\'t send incoming connections for all profiles." into gingerbread 2010-10-27 23:44:02 -07:00
Jaikumar Ganesh
025f78ebb8 Merge "DO NOT MERGE Fix auto connection with headsets which don't send incoming connections for all profiles." into gingerbread 2010-10-27 23:42:43 -07:00
Jaikumar Ganesh
28967499d7 DO NOT MERGE Fix auto connection with headsets which don't send incoming
connections for all profiles.

Bug: 3136095
Change-Id: I48f36b99f3f7619a6a18c6adc2057c9d6d23c3e3
2010-10-27 16:34:43 -07:00
Dianne Hackborn
96abb48dff am aa93bcd6: Fix issue #3138926: App\'s preferences can be lost after onPause() 2010-10-27 14:59:28 -07:00
Dianne Hackborn
aa93bcd624 Fix issue #3138926: App's preferences can be lost after onPause()
Change-Id: Icea3d37fab5e47c89c5cbc0adff7bbec898fa93e
2010-10-27 13:57:00 -07:00
Nick Pelly
222f489fc0 am 6d55e134: Make best effort attempt to recover NFC service when it dies. 2010-10-27 10:43:19 -07:00
Nick Pelly
6d55e1342f Make best effort attempt to recover NFC service when it dies.
Retrieve the service again from ServiceManager on RemoteException.

Change-Id: Ie227b52019e7deafeab712af1addd6d957f7a8ee
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-27 01:15:32 -07:00
Jeff Hamilton
f56aac4b6e am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:16:10 -07:00
Jeff Hamilton
68a5c9f3cf Add a way to get a string for an error code.
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
2010-10-26 14:09:48 -05:00
Roger Olsson
a7e77546ca TabWidget orientation
TabWidget orientation specified in tab_content.xml instead of TabWidget.java.
Generally, the orientation of the TabWidget should be set in xml-files
and not in TabWidget.java. A sub class of TabActivity may call setContentView()
using a custom layout where the TabWidget orientation is vertical.
This is the case in the UI Enablers Bottom Tab feature, for landscape
display orientation.

Change-Id: Ia677441a0af96a8d2ab47ef3298eb440c34924f6
2010-10-26 14:41:01 +02:00
Adam Powell
67bb674196 am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test
2010-10-25 12:07:51 -07:00
Adam Powell
17efcde161 Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 2010-10-25 11:43:03 -07:00