12584 Commits

Author SHA1 Message Date
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
Neal Nguyen
2202c8b9f2 am 06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
* commit '06875afad6101892a735f79aeb2c7bdbb58c26fa':
  A little tweaking of DL Manager tests and adding better debugging output.
2010-10-29 17:10:12 -07:00
Neal Nguyen
65c36e6133 A little tweaking of DL Manager tests and adding better debugging output.
Adding more detail to the output logging to help track down issues, fixing some
download completed notification counter flakiness and making reboot test more
robust, and reducing the number of concurrent downloads in testMultipleDownloads()
to 10. After talking with Vasu, this is probably more appropriate as it is
closer to typical usage scenarios, and as a side effect should trim some
time from the test runs. Large numbers of downloads will be left for stress
testing.

Change-Id: Ie337cfe9b8d27299d70553e39c60e241ff3afe66
2010-10-29 15:25:11 -07:00
Leon Clarke
dff795d0e3 am 5ccbe059: DO NOT MERGE. Add assets for <select>
* commit '5ccbe05945325dc77d543d44b69a7f80196d8cb9':
  DO NOT MERGE. Add assets for <select>
2010-10-29 14:49:07 -07:00
Leon Clarke
5ccbe05945 DO NOT MERGE. Add assets for <select>
Bug:3133784

Cherry-picking to GB from master.

Change-Id: I7d37c22f555d0e7c59a58fdad1516d3d77bf6d14
2010-10-29 17:08:35 -04: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
Raphael
04194ecf3a Support for <compatible-screens><screen> in ADT.
SDK Bug: 3125910

Change-Id: I529a5f4e4ece3222495e3a0a78c80286483d218f
2010-10-27 15:17:40 -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
Andy McFadden
e3e8642ce4 am 001c7d12: Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:25:29 -07:00
Andy McFadden
001c7d1281 Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:22:50 -07:00
Andy McFadden
1b4c7966b1 Set capabilities sooner.
Bug 3135433.

Change-Id: I4e34b60c0a01b85ce0d80eb96ff3510604a68c71
2010-10-27 11:26:05 -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
Jeff Hamilton
6a49bff569 am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:24:57 -07:00
Jeff Hamilton
d6c052a8ec Make some contructors public but hidden.
This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
2010-10-26 08:59:18 -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
Eric Fischer
b2ddeee2d2 am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp

* commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
  Import revised translations.  DO NOT MERGE
2010-10-25 16:19:42 -07:00
Eric Fischer
3d1ce9ec2a Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-25 16:14:47 -07:00
Eric Fischer
0820821213 Import revised translations. DO NOT MERGE
Change-Id: I404fe29521193ca9d0a3689d4a786253dc27e2d6
2010-10-25 15:41:31 -07:00
Jeff Hamilton
fecc5f066d am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread
Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp

* commit '106165b5102be226eb8049d2f7f62d7e26034e8a':
  Add a RHS status bar slot for NFC.
2010-10-25 14:49:07 -07:00
Jeff Hamilton
e0be933ec7 Add a RHS status bar slot for NFC.
Change-Id: I62cbcec051a2c69f76fb9a5b9ff6f6bc05a8257b
2010-10-25 16:41:41 -05: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
Scott Main
177b05d614 am abb50f15: Merge "docs: fix a couple api links" into gingerbread
Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp

* commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd':
  docs: fix a couple api links
2010-10-25 11:27:55 -07:00
Scott Main
abb50f1528 Merge "docs: fix a couple api links" into gingerbread 2010-10-25 11:18:28 -07:00
Adam Powell
b9b8f7b99b DO NOT MERGE Fix bug 3124899 - timeout in CTS test
ExpandableListViewBasicTest

A certain sequence of events could cause AbsListView to enter an
infinite event loop. Only report reaching a scroll boundary to the
overscroll code path if the Scroller wants to move further, not if
we're done moving.

Change-Id: Ifdaf72d60ca25584e4a37d3d8f17365e0fcbfa40
2010-10-25 11:12:41 -07:00
Nick Pelly
4c8fda62e1 am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
Merge commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e' into gingerbread-plus-aosp

* commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e':
  Fixed NdefTag parcelable conversion methods.
2010-10-25 09:09:37 -07:00
Sylvain Fonteneau
e2e4ea9ea8 Fixed NdefTag parcelable conversion methods.
Also removed call to obsolete openTagConnection() method which was crashing.

Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-25 08:55:36 -07:00
Peter Eliasson
f313b9e841 Adding pan behavior on preference dialog.
Changed the preference dialog with text input to pan if
the display area is limited. This helps the user to see
the input better.

Change-Id: I12341546f6f82601ac5a2746153255a9b2d49a1c
2010-10-25 14:33:06 +02:00
Nick Pelly
d6abaf326b am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Merge commit '145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp

* commit '145550a00ea59ff20133acc95315e463628e16db':
  Document getPollBytes() and getActivationBytes().
2010-10-24 22:11:52 -07:00
Nick Pelly
145550a00e Merge "Document getPollBytes() and getActivationBytes()." into gingerbread 2010-10-24 22:06:15 -07:00
Nick Pelly
416d72f4b6 Document getPollBytes() and getActivationBytes().
No code change.

Change-Id: Ideb427b2684b9f9296abefb7c97eabc52db73ee0
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-24 22:03:04 -07:00
Dianne Hackborn
c2f78020d3 am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread
Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp

* commit '236568999411214ef440cabc6d12e3bf5f19d8f4':
  Fix issue #3126018: No way to specify NativeActivity's native method
2010-10-24 18:38:11 -07:00
Dianne Hackborn
e21d91c694 Fix issue #3126018: No way to specify NativeActivity's native method
Change-Id: I59de6a543e7f7f45d963a905829a3f56f32bf8cf
2010-10-24 14:56:38 -07:00