29528 Commits

Author SHA1 Message Date
Martijn Coenen
72df4ea830 Remove Type X Tags from the top-level API.
Also added an extra to carry the ndef message, so we can have it in multiple
Ndef instances without doing an active read.

Change-Id: I2ecabc24732990c5c9979ee3a001a7fb13da21d9
2010-12-07 13:51:47 -08:00
Jean-Baptiste Queru
ee27dd356e am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master
* commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
  Strings for NI position request are moved to resources
2010-12-07 13:02:22 -08:00
Jean-Baptiste Queru
12902d687f resolved conflicts for merge of 78742e01 to stage-korg-master
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
2010-12-07 12:51:49 -08:00
Daniel Sandler
f340d082b8 Merge "More precise status bar battery icons." into gingerbread 2010-12-07 12:03:36 -08:00
Jean-Baptiste Queru
78742e01f7 Merge "Strings for NI position request are moved to resources" 2010-12-07 12:01:25 -08:00
Nick Pelly
8c30a47d80 am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread
* commit '47e6ccb65ab0088cf04809c234cdb5f747579c8c':
  Corrected MIFARE default key set
2010-12-07 09:34:47 -08:00
Nick Pelly
47e6ccb65a Merge "Corrected MIFARE default key set" into gingerbread 2010-12-07 09:29:21 -08:00
Jan Brands
65c3f9806e Corrected MIFARE default key set
The all-zero key is not a commonly used key.
Fixed naming

Change-Id: I2fb86079159195c6893ea758e8b0bbda266dc420
2010-12-07 09:27:06 -08:00
Chung-yih Wang
c9cc9ab590 am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
* commit '5f86d7f50beba9f6327b8a04defe4e989a153d4a':
  Fix SIP bug of different transport/port used for requests.
2010-12-06 22:10:29 -08:00
Chung-yih Wang
5f86d7f50b Merge "Fix SIP bug of different transport/port used for requests." into gingerbread 2010-12-06 22:07:59 -08:00
Dirk Dougherty
0d49a4e838 am 0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.
* commit '0871ee0c6f43a7201ce49a66211c1c850eabeb6b':
  Doc change: fix href to axis_globe_inverted orientation diagram.
2010-12-06 19:44:36 -08:00
Dirk Dougherty
0871ee0c6f Doc change: fix href to axis_globe_inverted orientation diagram. 2010-12-06 19:40:21 -08:00
Martijn Coenen
7012f1eb37 am 9a9706a2: Added missing ndef technology to getTech.
* commit '9a9706a213637b396226afff53c69927283609a7':
  Added missing ndef technology to getTech.
2010-12-06 18:48:02 -08:00
Nick Pelly
68cea27329 am e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
* commit 'e58e8a715b2c9e4f2d053e0dc95e88690a54c059':
  Added NdefFormatable tag, initial class with supported methods.
2010-12-06 18:44:13 -08:00
Martijn Coenen
9a9706a213 Added missing ndef technology to getTech.
Change-Id: I1f08e140c9bb43a8e894812adbc4d11801637f46
2010-12-06 18:44:12 -08:00
Nick Pelly
e58e8a715b Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread 2010-12-06 18:41:36 -08:00
Martijn Coenen
39f91ed529 Added NdefFormatable tag, initial class with supported methods.
Change-Id: Ifa358b5e980158d5e8accb9f42fdcfb29ad81e64
2010-12-06 18:38:49 -08:00
Chung-yih Wang
f053292d7a Fix SIP bug of different transport/port used for requests.
bug: http://b/3156148
Change-Id: I4fa5b274d2e90ebde12d9e99822dc193a65bad32
2010-12-07 10:36:19 +08:00
Mathias Agopian
0484a673c5 am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread
* commit 'daef0a040de7a9825bdbcba7b2eae66195e3a95f':
  [3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
2010-12-06 18:22:57 -08:00
Mathias Agopian
daef0a040d Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread 2010-12-06 18:20:09 -08:00
Nick Pelly
ea294903ca am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
* commit 'eba947a32a0233b3a2b384c580ab47bc7f27bb4d':
  Remove ACTION_TAG_DISCOVERED from protected broadcast list.
2010-12-06 17:45:25 -08:00
Nick Pelly
eba947a32a Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread 2010-12-06 17:43:46 -08:00
Nick Pelly
35042f1f58 Remove ACTION_TAG_DISCOVERED from protected broadcast list.
ACTION_TAG_DISCOVERED is a start activity intent, not a broadcast intent, so
its presence in this list is redundant.

Change-Id: I05419ec9c4471b7b11c9ae50a02e5ac3d9e572d2
2010-12-06 17:32:59 -08:00
James Dong
23b791cd0f am d57fbe88: Fixed a race condition where some recording frames may not be released
* commit 'd57fbe887fabd027e644caeaa2139c863143a786':
  Fixed a race condition where some recording frames may not be released
2010-12-06 15:36:04 -08:00
James Dong
d57fbe887f Fixed a race condition where some recording frames may not be released
bug - 3258924

Change-Id: I4f30d04a713676f5da40e6a7dd861510cc041f9b
2010-12-06 15:05:06 -08:00
Daniel Sandler
5ebb8507d5 More precise status bar battery icons.
The rule is: 1px per 5%, which just about covers the entire
bounding box of the battery body (21px, actually).

(For the charging animation I got lazy and just cut an image
every 10% / 2px.)

Color band reference:
	Green: 100-30%
	Yellow: 25-20%
	Orange: 15%
	Red: 10-0%

Bug: 3136046
Change-Id: I49d2cc9dbfff7228a6af53dfd9d8d5e56c2233e7
2010-12-06 16:52:38 -05:00
Jean-Baptiste Queru
465e88eb00 am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout."
* commit '1ee2394edd4b90111f8174862c7c0f435e1a3634':
  Changing connect and response timeout.
2010-12-06 13:46:19 -08:00
Jean-Baptiste Queru
1ee2394edd am 1d67fa5b: Merge "Changing connect and response timeout."
* commit '1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
  Changing connect and response timeout.
2010-12-06 13:43:36 -08:00
Jean-Baptiste Queru
1d67fa5b11 Merge "Changing connect and response timeout." 2010-12-06 13:39:19 -08:00
Jean-Baptiste Queru
62f6e1d883 am 005dd44b: am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '005dd44b756ccd5812ac55f07f93e3e16ce2be0b':
  NumberPicker: Set formatter local value to US.
2010-12-06 11:05:47 -08:00
Jean-Baptiste Queru
005dd44b75 am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '864b1e007dc741ec10c23cabc0271f97a5b8c598':
  NumberPicker: Set formatter local value to US.
2010-12-06 11:03:11 -08:00
Jean-Baptiste Queru
864b1e007d Merge "NumberPicker: Set formatter local value to US." 2010-12-06 10:57:04 -08:00
Chen Libao
f04f7ae73b NumberPicker: Set formatter local value to US.
As the Arabic language formatter would make number "1,2,3" to Arabic
language word means one,two,three, NumberPicker won't like to show
any thing other than numbers, add local settings to US, make the
number 1,2,3

Change-Id: If2d161ac4133f6c9c6e1ec284d6d2fbf01855fa0
2010-12-06 10:32:53 +01:00
Henrik Baard
d39fd5a97c Changing connect and response timeout.
In bad network conditions and where switches often occur between 2G and
3G the timeout of 20s is too short.

Setting this timeout to 60 seconds will improve functionality in bad conditions
while it will not affect functionality in good networks. This change also aligns
the timeouts with the timeouts used by the Browser (Connection.java).

Change-Id: I0fbe3cbfe734f8d55a41bfa5d8ab6b332a19f912
2010-12-06 07:57:02 +01:00
Jeff Hamilton
ea2837c4eb am c1576ad6: Update the docs to clarify the ordering constraints.
* commit 'c1576ad627d3d2b2d3c0764c605ebbf3ddc24401':
  Update the docs to clarify the ordering constraints.
2010-12-05 20:03:59 -08:00
Jeff Hamilton
c1576ad627 Update the docs to clarify the ordering constraints.
Change-Id: Ib3932e637a675c875b9ed3482826a150b845a385
2010-12-05 21:50:29 -06:00
Nick Pelly
cbf4e3525b am 3d524e56: Merge gingerbread-nfc into gingerbread
* commit '3d524e562606e7994ede3429b37937f40f94cd41':
  First implementation of MifareUltralight
2010-12-05 18:13:10 -08:00
Nick Pelly
3d524e5626 Merge gingerbread-nfc into gingerbread 2010-12-05 18:08:16 -08:00
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
Irfan Sheriff
18cbfecd8a am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
* commit 'bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
  DO NOT MERGE Avoid nullifying dhcp target
2010-12-04 23:45:18 -08:00
Irfan Sheriff
bd3dd73b36 Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread 2010-12-03 17:58:17 -08:00
Mathias Agopian
025005f562 [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
This is a poor's man precursor to the h/w composer HAL.
Basically we detect when a window is full screen and in
that case we bypass surfaceflinger's composition step, which
yields to much improved performance.

Change-Id: Ie03796ae81a1c951949b771c9323044b980cb347
2010-12-03 17:35:07 -08:00
Mathias Agopian
48e723a0ee [3171580] Add transform field to native buffers. (DO NOT MERGE)
This field indicate how the content of the buffer
needs to be transformed.

Change-Id: Ide3e980a90599e931406135693231276626adbbb
2010-12-03 17:35:07 -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
Mathias Agopian
1989af22b5 [3171580] Fix two typos related to fixed-size buffers
mFixedSize was never set, this bug was introduced during some "cleanup", in
practice this could cause some issues when a fixed-size buffer was used and
the window was resized.

Layer::drawForSreenShot() had a typo that had no effect.

mFixedSize was used to determine if filtering was needed, which was a bit too
conservative and created a dependency between filtering and "fixed size" states
which should exist.

Now we enable filtering based on the size of the buffer vs. the size of the layer.

Change-Id: I32044e91b0c944c1b137efdceb3f01dfaa78119d
2010-12-03 17:35:06 -08:00
Mathias Agopian
e869aee382 [3171580] don't automatically log GraphicBuffer allocation failures
some of these failures are not fatal and even expected in some cases
so they should not emit a dump in the log in those cases.

Change-Id: Idcfa252e3bfa9d74e27fe4ad8f8623aa01aa9c5e
2010-12-03 17:33:09 -08:00
Jan Brands
2fe24e3e14 First implementation of MifareUltralight
Change-Id: I77818ddc89b529c17fc41d6c0850688365c6b770
2010-12-03 23:45:03 +01:00
Mathias Agopian
698a8aaca2 [3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
(there are multiple bugs this should fix)

we now use the EGL_NATIVE_VISUAL_ID of a config to set
the ANativeWindow's format from eglCreateWindowSurface(),
this guarantees that the surface's format will match
whatever EGLConfig the user chose.

this should fix all current and future config/surface format
mismatch and allow users to easily select 32-bits surfaces.

Change-Id: I3835d0eb70c75eeecded3c3509a0a8207554c98b
2010-12-03 14:15:40 -08:00