Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,517 Commits 3 Branches 0 Tags
1bec55bd244f72c65fa254118a72ad3ed10aa845
Commit Graph

10294 Commits

Author SHA1 Message Date
Brad Fitzpatrick
5f8524d446 am 36af7943: Fix malformed Javadoc. 
* commit '36af79434fb62c26238132eaeda2ec5e732f3c2f':
  Fix malformed Javadoc.
 2010-12-08 13:23:03 -08:00
Brad Fitzpatrick
36af79434f Fix malformed Javadoc. 
Change-Id: I5cfbd49272117defce5226da0f40a8392457a2e2
 2010-12-08 11:31:07 -08:00
Nick Pelly
8abce7f56e am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread 
* commit '40ddd4a64908c0cbe4970d2ba1703f74717620a8':
  Implemented getSize() to return max ndef size.
 2010-12-07 22:57:23 -08:00
Nick Pelly
40ddd4a649 Merge "Implemented getSize() to return max ndef size." into gingerbread 2010-12-07 22:55:21 -08:00
Martijn Coenen
6d9fc7e1ef Implemented getSize() to return max ndef size. 
Change-Id: Ia584e8cfa51a4eaef5f03dc436c78a67296c2cae
 2010-12-07 22:54:07 -08:00
Martijn Coenen
2f3ed7912e am 5289b91c: Implement ndef formatting. 
* commit '5289b91c885158094988a9a7b51b3139565eb639':
  Implement ndef formatting.
 2010-12-07 22:35:01 -08:00
Martijn Coenen
5289b91c88 Implement ndef formatting. 
Change-Id: I6e3e3abdc304bc14d7c93a413e42bf957963e288
 2010-12-07 22:30:39 -08:00
Dianne Hackborn
c4b7088f19 am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread 
* commit '42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
  Add more checks for bad values to protect from corrupt files.
 2010-12-07 22:07:40 -08:00
Dianne Hackborn
42a23783aa Merge "Add more checks for bad values to protect from corrupt files." into gingerbread 2010-12-07 22:04:38 -08:00
Dianne Hackborn
7b9c56fe0f Add more checks for bad values to protect from corrupt files. 
Change-Id: I4174c358c49b93e74920b00fcfd6c68659bf7d08
 2010-12-07 22:02:59 -08:00
Mathias Agopian
a0f011ff49 am 05813b0e: Merge changes I244b5469,I32044e91 into gingerbread 
* commit '05813b0eb92cb1bc79607ee402f14ca1e4b43f6d':
  [3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
  [3171580] Fix two typos related to fixed-size buffers
 2010-12-07 14:20:14 -08:00
Mathias Agopian
05813b0eb9 Merge changes I244b5469,I32044e91 into gingerbread 
* changes:
  [3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
  [3171580] Fix two typos related to fixed-size buffers
 2010-12-07 14:18:21 -08:00
Jeff Hamilton
03dc51b1a0 am 0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread 
* commit '0f74afbbf4bd0fe35889e26fc46f94c4ca6382d8':
  Remove Type X Tags from the top-level API.
 2010-12-07 14:04:40 -08:00
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
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
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
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
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
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
Jeff Hamilton
609b3e429a Merge remote branch 'ohd/gingerbread' into merge 2010-12-02 09:41:16 -06: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