12472 Commits

Author SHA1 Message Date
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
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
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
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
Eric Rowe
288f13730e am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
Merge commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82' into gingerbread-plus-aosp

* commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82':
  Change disable timeout for BT disable stress test
2010-10-22 18:21:09 -07:00
Nick Pelly
f5b5d177a9 am 07f3bee2: Push Tag/NdefTag implementation details into the service.
Merge commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569' into gingerbread-plus-aosp

* commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569':
  Push Tag/NdefTag implementation details into the service.
2010-10-22 18:20:52 -07:00
Eric Rowe
8de43ab5ba Merge "Change disable timeout for BT disable stress test" into gingerbread 2010-10-22 17:14:12 -07:00
Eric Rowe
867568314d Change disable timeout for BT disable stress test
Bug: b/3125900
Change-Id: Ie1f599f1c418fc40c29debd1401297441a2a9db3
2010-10-22 16:34:33 -07:00
Nick Pelly
07f3bee2db Push Tag/NdefTag implementation details into the service.
Tag/NdefTag objects should just be simple data objects. Push the mapping of
internal tag type to public rawTarget/ndefTarget into Nfc Service.

This gives an oppurtunity to clean up some Tag/NdefTag API methods. Most
significantly, adding createMockTag() and createMockNdefTag() to help with
application testing.

There will probably be some more tweaking of the types/targets in
Tag/NdefTag to come, this commit makes that a lot easier.

Also:
- Introduce getActivationBytes() and getPollBytes(). These are just stubs
for NFC service to implement, we have feedback these are really important
to help identify NFC tags.
- Based on outside advice, remove 3B_PRIME (roll into 3B) and TOPAZ (roll
into 3A).

Change-Id: I3e6789c047f6ee5c298bf76c65e0885cf3c15d97
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-22 16:29:43 -07:00
Eric Fischer
d13f5f4fea am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:08:27 -07:00
Eric Fischer
67496e591d Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:06:38 -07:00
Eric Fischer
26dc88afdb am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread 2010-10-22 16:01:34 -07:00
Eric Fischer
a3e70a430e Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread 2010-10-22 15:59:42 -07:00
Eric Fischer
36504f2d9c Import revised translations. DO NOT MERGE
Change-Id: If41b9f790002bb3cf0adb5214955f496a7170e61
2010-10-22 15:24:30 -07:00
Eric Fischer
c5cde13397 Add a space before the weekday in the zh_CN lock screen date format.
Bug 3121853

Change-Id: I3685079bc504544c8d244d8a926c02a5eb367d21
2010-10-22 14:52:46 -07:00