Eric Fischer
0820821213
Import revised translations. DO NOT MERGE
...
Change-Id: I404fe29521193ca9d0a3689d4a786253dc27e2d6
2010-10-25 15:41:31 -07:00
Nick Pelly
79e76f52a6
Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
2010-10-25 08:58:00 -07:00
Wu-cheng Li
8982120437
Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
2010-10-25 08:55:54 -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
Wu-cheng Li
994c02bbfe
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
...
Now overlay does flip before rotation.
bug:3114236
Change-Id: I1780e56154566435a0ceeb2f101de7ed0a0613cb
2010-10-25 14:56:22 +08: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
2365689994
Merge "Fix issue #3126018 : No way to specify NativeActivity's native method" into gingerbread
2010-10-24 18:33:36 -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
Jeff Brown
860c2df413
Merge "Add unit tests for native input and fix bugs identified." into gingerbread
2010-10-24 14:18:19 -07:00
Joe Onorato
60607a9012
Make sure that when the screen is off, we don't try to turn the buttons on too.
...
Bug: 3117801
Change-Id: I763f114a2b0426660d29bbda04ea7db12c1137e8
2010-10-23 14:49:57 -07:00
Jeff Brown
c3db858de9
Add unit tests for native input and fix bugs identified.
...
Fixed a bug where we would lose the first touch point when swiping out of
the virtual key area.
Fixed a bug where we would not send an ACTION_MOVE event in cases where
individual pointers went down/up and the remaining pointers actually moved.
This is important since many applications do not handle pointer movements
during ACTION_POINTER_DOWN or ACTION_POINTER_UP. In the case of
ACTION_POINTER_UP the movement was completely lost since all pointers were
dispatched using their old location rather than the new location.
Improved motion event validation to check for duplicate pointer ids.
Added an input source constant that was missing from the NDK api but
defined in the framework api.
Added a timestamp when reporting added/removed devices in EventHub.
Bug: 3070082
Change-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56
2010-10-23 03:52:57 -07:00
Eric Laurent
b6a2256e54
Merge "Fix issue 3126094." into gingerbread
2010-10-22 18:37:09 -07:00
Eric Laurent
cc02ac54ac
Fix issue 3126094.
...
android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.
Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
2010-10-22 18:08:13 -07:00
Eric Fischer
ecae6e06a3
Merge "Import translations for status bar." into gingerbread
2010-10-22 17:14:36 -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 Fischer
4aa82a7b7a
Import translations for status bar.
...
Change-Id: I5f40e9c507530fb4110da711e54465c2ae920a94
2010-10-22 16:49:14 -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
67496e591d
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-22 16:06:38 -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
Dianne Hackborn
38993d8d83
Merge "Fix issue #3122240 : Expose xlarge in GB." into gingerbread
2010-10-22 14:01:25 -07:00
Dianne Hackborn
5383f502e4
Fix issue #3122240 : Expose xlarge in GB.
...
Plus some other small API cleanup.
Change-Id: I1a3c60f510f99224cccac9cc3f838f04141064f8
2010-10-22 12:59:20 -07:00
Kenny Root
40763914e3
Merge "Exit immediately on some linklib failures" into gingerbread
2010-10-22 12:17:02 -07:00
Justin Ho
0b01eb266f
Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread
2010-10-22 12:14:26 -07:00
Justin Ho
3162a3cee0
DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator
...
Change-Id: Ia855f0461a984974e3f54d8f8f5fe146ff330c4f
2010-10-22 11:55:58 -07:00
Dianne Hackborn
7ce276b5a3
Merge "Update script for copying NDK headers/library." into gingerbread
2010-10-22 10:58:35 -07:00
Jeff Hamilton
7c68bc3867
Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
2010-10-22 10:20:06 -07:00
Nick Pelly
0592832c5e
Merge "Attempt to fix simulator build." into gingerbread
2010-10-22 08:49:51 -07:00
Nick Pelly
1af97f0b78
Attempt to fix simulator build.
...
Change-Id: I7f912ce58292bdd03fa683d2e5c203480d94e945
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-22 08:48:48 -07:00
Mike Lockwood
f6572e7ee4
Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
2010-10-22 08:02:09 -07:00
Kenny Root
8ad30b5b7e
Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread
2010-10-22 07:55:44 -07:00
Mike Lockwood
edc0f3876c
GPS: Fix network type logic in requestRefLocation
...
Change-Id: I20ef81bcf029b289389dba57e6cf457fda5acbf4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-22 09:16:17 -04:00
Hung-ying Tyan
1257d330dc
Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
2010-10-21 23:08:59 -07:00
Jeff Hamilton
da83f513ca
Unhide some NFC APIs that are required for the Tag app.
...
Change-Id: Ic64e00476132dbf4644de5c465e06fe11a264508
2010-10-21 23:43:22 -05:00
Dianne Hackborn
de5ba5ef72
Update script for copying NDK headers/library.
...
Change-Id: Ia441ce37123d5b5cd343f2746671495705501fb5
2010-10-21 21:10:26 -07:00
Jeff Hamilton
389a440ad1
Backport ParcelFileDescriptor.createPipe() from master.
...
This allows content providers to expose arbitraty data
through the ContentResolver open* APIs.
Change-Id: I408a0b7cee9cdba5654a962098386c012d6b3549
2010-10-21 22:39:41 -05:00
James Dong
1bd8a8c8ac
Merge "Turn the media time adjustment in file writer back on" into gingerbread
2010-10-21 20:06:59 -07:00
Dianne Hackborn
fdbb2168f7
Merge "Adjust boundaries for screen sizes." into gingerbread
2010-10-21 19:21:28 -07:00
Dianne Hackborn
ba501785c7
Merge "Implement issue #3116702 : New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
2010-10-21 19:20:49 -07:00
Dianne Hackborn
bf5efba238
Merge "Fix issue #3117918 : No way to finish a native activity" into gingerbread
2010-10-21 19:09:44 -07:00
Dianne Hackborn
db28a94d49
Fix issue #3117918 : No way to finish a native activity
...
Change-Id: Ic53e712f7ab5412d72a31b96ecba252344b91644
2010-10-21 19:07:37 -07:00
James Dong
89a0104c7c
Turn the media time adjustment in file writer back on
...
o This was turned off to unblock the tests on some device
o The adjustment duration is increased to suppress fluctuations observed on some device
bug - 3058745
Change-Id: Iaeeb1c1c52783f5c679305645c995e57b4b2a573
2010-10-21 18:41:31 -07:00
Jeff Brown
6b3178a632
Merge "Fix a race condition in wallpaper move throttling." into gingerbread
2010-10-21 18:02:54 -07:00
Hung-ying Tyan
60c45d0269
Clean up pending sessions on incoming call in SipService
...
Bug: 3122186
Change-Id: I25c9aa19d138f6940a29025d54e7bc2ffb7daa29
2010-10-22 09:01:49 +08:00
Jeff Brown
840db1f678
Fix a race condition in wallpaper move throttling.
...
Bug: 3099316
Change-Id: Ia3221975b5be7fae8359d6ab531bbecd0e29aee9
2010-10-21 17:36:54 -07:00
Dianne Hackborn
e9dbf208e4
Merge "Fix issue #3117472 : Format storage dialog still broken" into gingerbread
2010-10-21 17:28:19 -07:00
Mathias Agopian
aa6df3669d
Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread
2010-10-21 16:43:00 -07:00