Nick Pelly
28e8c66d4b
am d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
...
* commit 'd8c323321c28a0a5ff70c6e0694aa822edca4005':
Fixed technology name typo's.
Implement historical bytes / attrib on IsoDep
Provide system code and manufacturer code for Felica tech.
Fixed NfcAdapter init and getTechnology().
Secure Element access implementation
Rough first pass at the NFC technology API.
Revert "Merge "Remove the My Tag feature." into gingerbread"
2010-12-05 14:49:00 -08:00
Nick Pelly
d8c323321c
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
2010-12-05 14:46:29 -08:00
Nick Pelly
16ec9c5bb5
Merge branch gingerbread-nfc into gingerbread.
...
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
2010-12-05 14:45:29 -08:00
Mathias Agopian
e33811512e
[3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
...
We only used to check for INVISIBLE, which prevented some Surfaceview
optimization to take place.
Change-Id: I244b54696d861a022ca1c334ff61ab7efb899587
2010-12-03 17:35:06 -08:00
Jan Brands
2fe24e3e14
First implementation of MifareUltralight
...
Change-Id: I77818ddc89b529c17fc41d6c0850688365c6b770
2010-12-03 23:45:03 +01:00
Hakan Gustavsson
dea74b0285
Strings for NI position request are moved to resources
...
The strings used by the framework for network initiated position
requests are now string resources that can be properly localized.
Change-Id: If1cba89adb1bfcb9c8fdb59b9c5aa1107b11279e
2010-12-03 09:47:21 +01:00
Xia Wang
5343f5a84e
am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
...
* commit '3591bebd5957a8547fc54659179a19440636e7f9':
Restore Wi-Fi configuration after the test. DO NOT MERGE
2010-12-02 13:44:54 -08:00
Xia Wang
3591bebd59
Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
2010-12-02 13:40:23 -08:00
Jeff Hamilton
609b3e429a
Merge remote branch 'ohd/gingerbread' into merge
2010-12-02 09:41:16 -06:00
Xia Wang
fddbe98cca
Restore Wi-Fi configuration after the test. DO NOT MERGE
...
- save Wi-Fi configuration and restore it after the test, other tests
may need data connection
- Fix issue: reset dhcp after parsing a static IP setting.
bug: 3240713
Change-Id: I2158cab6fb6751414893b6a950d9e5bb20021645
2010-12-01 15:18:31 -08:00
Kenny Root
1de6ca69cc
am 938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
...
* commit '938d097263416ad416ee995e62dab559ea50bf0d':
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-01 14:20:49 -08:00
Kenny Root
938d097263
Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
2010-12-01 14:18:23 -08:00
Kenny Root
1de2eac9d0
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
...
Be compatible with the old DownloadProvider behavior of being able to
operate on content URIs returned from .insert()
Bug: 3242328
Change-Id: I7dad15ac0fefa867c3c8a33a579fc9899ac80262
2010-12-01 11:37:53 -08:00
Brad Fitzpatrick
7e5cd79683
am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
...
* commit '981a72a1506f7e6e42747b9aa0be2001795c6619':
[don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 08:50:00 -08:00
Brad Fitzpatrick
981a72a150
Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread
2010-12-01 08:46:52 -08:00
Martijn Coenen
67a337bc51
Fixed technology name typo's.
...
Change-Id: If39b109cb60c762d50c21f6aaced0a31abb66c40
2010-12-01 14:16:59 +01:00
Mathias Agopian
be0ece6f85
am 186b68b7: Merge "allow rotation-vector to have 4 components" into gingerbread
...
* commit '186b68b74417e8ef73f2083769166e7785df6c30':
allow rotation-vector to have 4 components
2010-11-30 15:41:41 -08:00
Mathias Agopian
7badd2c402
allow rotation-vector to have 4 components
...
- upadte documentation for rotation vector
- update method dealing with rotation vector to deal with 4 components
- virtual rotation-vector sensor reports all four components
- improve SensorManager documentation layout
Whent he 4-th component of the rotation-vector is present, we can save
a square-root when computing the quaternion or rotation matrix from it.
Change-Id: Ia84d278dd5f0909fab1c5ba050f8df2679e2c7c8
2010-11-30 14:07:09 -08:00
Brad Fitzpatrick
d2bbaaf294
[don't auto-merge] Don't re-read SharedPreferences unnecessarily.
...
Bug: 3211034
Bug: 3216290
Change-Id: Idd5cc25965d400f20122372ca1cf47d4703dd87c
2010-11-30 12:59:28 -08:00
Eric Fischer
30a0e0db71
am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '3e6fb5d66eed34c91b9b056ad2d4c317186476fd':
Import revised translations. DO NOT MERGE
2010-11-30 11:48:00 -08:00
Ben Murdoch
d2607118ed
am 27e728f2: Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
...
* commit '27e728f22d954caa7252be6c19a67a9277e1db3b':
Hide plugin views when we start playing HTML5 video
2010-11-30 11:46:24 -08:00
Eric Fischer
3e6fb5d66e
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-11-30 10:12:46 -08:00
Ben Murdoch
27e728f22d
Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
2010-11-30 02:43:29 -08:00
Eric Fischer
9d9f83a787
Import revised translations. DO NOT MERGE
...
Change-Id: I627dac0019241260b99a049091dca67dae996246
2010-11-29 16:14:35 -08:00
Martijn Coenen
bc7180bba4
Implement historical bytes / attrib on IsoDep
...
Change-Id: Ic7afa29515d10fec72ac8f27adc411788ad6f68c
2010-11-29 17:03:35 +01:00
Martijn Coenen
438feb9b3b
Provide system code and manufacturer code for Felica tech.
...
Change-Id: I56d5308ad5fa4998a88e1e0aec51fe301ab99078
2010-11-25 09:40:50 +01:00
Xia Wang
a23fff3351
am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
...
* commit 'c1c04ad047d7ca2f13aa5c9883da7219df5bee57':
Add Wi-Fi tests for static IP. DO NOT MERGE
2010-11-24 13:29:56 -08:00
Martijn Coenen
1253ebc74a
Fixed NfcAdapter init and getTechnology().
...
- GetTechnology() used a binary search, but the array was linked to another
array (extras) which was not sorted. So made it linear.
- The tag technologies were instantiated with a null NfcAdapter.
Change-Id: Iae15169a89155c3a5c9f81824f809d6010ebac01
2010-11-24 11:13:57 +01:00
Xia Wang
739d0aed02
Add Wi-Fi tests for static IP. DO NOT MERGE
...
- Add support in parser to parse static IP settings
- Add test for static IP configuration
Change-Id: I37e11ceb0f34c87113d8281b4de09893506c29e7
2010-11-22 19:10:01 -08:00
Xia Wang
6bdd69370f
am 5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
...
* commit '5df8c155872833647ac56951ab90bd26a9af9480':
Add Wifi Tethering stress test
2010-11-22 14:46:33 -08:00
Jean-Baptiste Queru
c8454a851f
am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
...
* commit 'b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
2010-11-22 13:44:56 -08:00
Xia Wang
6026d52710
Add Wifi Tethering stress test
...
Stress Wifi driver loading and unloading by enable/disable access point
mode.
Change-Id: Ie31266d2b9665cb304473f1c14c83bc57e9920f2
2010-11-22 12:00:31 -08:00
Deepika Sai Amuri
b00d41acd6
SearchDialog: Fix for NullpointerException while using Suggestions in
...
Browser
Change-Id: Ic208ae51e4f7678363ea6d7de9db97707713bf6d
2010-11-22 01:31:35 -08:00
Daniel Tomas
9024564107
Secure Element access implementation
...
Change-Id: I907e6771ecc5babe895115c3a49288fa2144a187
2010-11-19 22:23:45 -06:00
Jeff Hamilton
6be655c768
Rough first pass at the NFC technology API.
...
Change-Id: I903ad6bc124bf9a65af788dae45f55d58704ef7b
2010-11-19 20:26:29 -06:00
Wu-cheng Li
fb6f4505ba
am 589e8381: Merge "Improve camera documentation." into gingerbread
...
* commit '589e838116b0dffa696fa39336d0588124877f98':
Improve camera documentation.
2010-11-19 18:17:24 -08:00
Wu-cheng Li
589e838116
Merge "Improve camera documentation." into gingerbread
2010-11-19 18:14:43 -08:00
Mathias Agopian
d3b5510b85
am 927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
...
* commit '927e7410000dd1917387c01fc4229836ddd5eb97':
Fix SensorManager.getOrientation() documentation.
2010-11-19 17:20:14 -08:00
Mathias Agopian
f71384cd61
Fix SensorManager.getOrientation() documentation.
...
This function doesn't use the same reference coordinate system used
for the rotation matrix, unlike what the documentation previously
stated.
Change-Id: I38abeb74540d33b67f72993b54d7a00a73588dde
2010-11-19 16:25:11 -08:00
Brad Fitzpatrick
096c4c448d
am 251384a7: Merge "Improve performance when getting styled string."
...
* commit '251384a7595022ddbc53f4ab0fa386f9c040f1f5':
Improve performance when getting styled string.
2010-11-19 10:25:09 -08:00
Brad Fitzpatrick
251384a759
Merge "Improve performance when getting styled string."
2010-11-19 07:41:39 -08:00
Wu-cheng Li
99a3f3e4e0
Improve camera documentation.
...
bug:3212606
Change-Id: Iee7106e4665c08a4c75471114010b75d63ac74ce
2010-11-19 16:20:04 +08:00
Peter Eliasson
ac4a181d2e
Improve performance when getting styled string.
...
The style used in the composing text for input methods
takes a long time to create. This is experienced as a
lag when composing the first word.
The bottleneck lies in the 10 calls to
nativeIndexOfString which does a linear search through
thousands of strings.
Change-Id: I3184b2be3673d384cca19e9a70ad94b4d3085576
2010-11-18 07:28:06 +01:00
Jean-Baptiste Queru
74923d3ae4
am d34c1495: Merge "Prevent system crash when OOM in Binder thread."
...
* commit 'd34c1495020e5d72dd18959fb906375dc0874c04':
Prevent system crash when OOM in Binder thread.
2010-11-17 17:56:05 -08:00
Jean-Baptiste Queru
d34c149502
Merge "Prevent system crash when OOM in Binder thread."
2010-11-17 17:49:19 -08:00
Jean-Baptiste Queru
2f0a3307fd
Fix build (broken documentation link)
...
Change-Id: Ic36f81bbd9f112bd79f9177a407593e8c8f7f0ed
2010-11-17 17:39:16 -08:00
Jean-Baptiste Queru
1a2344b8b2
am 09e50cdb: Merge "Reorder lock acquision vs try."
...
* commit '09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
Reorder lock acquision vs try.
2010-11-17 17:16:06 -08:00
Jean-Baptiste Queru
09e50cdbc6
Merge "Reorder lock acquision vs try."
2010-11-17 17:03:10 -08:00
Jean-Baptiste Queru
f4072fcc14
resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp
...
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
2010-11-17 16:47:59 -08:00
Jean-Baptiste Queru
8fc378f9f5
Merge "Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter."
2010-11-17 15:10:05 -08:00