Nick Pelly
59b3866653
am 8c30a47d: am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread
...
* commit '8c30a47d801be50272098e60d0079ae1b4ebd22a':
Corrected MIFARE default key set
2010-12-07 09:40:35 -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
Amith Yamasani
475593e249
Merge "Prevent SearchView dropdown from showing up when SearchView is hidden."
2010-12-07 08:49:51 -08:00
Cary Clark
dc09b5ae89
check for native instance before calling
...
bug:3258992
Change-Id: Ia9bf7bdbbe2b5566121113174d032d316664f3b1
2010-12-07 10:58:00 -05:00
Leon Scroggins
244d2d4e9d
Delay message for <select> choice.
...
Bug:3230016
Pass the message after the page is set to active, which
calls a focus event, which may modify the page.
Change-Id: I594ba30a7a105595b27bc0356c164c41e48dcd15
2010-12-07 10:53:25 -05:00
Robert Greenwalt
da3d5e6587
Add a Dummy data connection for testing purposes.
...
Enable with:
<string-array translatable="false" name="networkAttributes">
<item>"wifi,1,1,1"</item>
<item>"dummy,7,7,0"</item>
</string-array>
in your config.xml
Change-Id: I3965edaeb4873e95131f4083b8d23d682ce17841
2010-12-07 07:48:33 -08:00
Dirk Dougherty
6fa74a5434
am 0d49a4e8: am 0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.
...
* commit '0d49a4e838769252a313738e30fe78557f769a59':
Doc change: fix href to axis_globe_inverted orientation diagram.
2010-12-06 23:36:18 -08:00
Martijn Coenen
8e2b422505
am 7012f1eb: am 9a9706a2: Added missing ndef technology to getTech.
...
* commit '7012f1eb3759a071f06cff69cf449adb4c62192b':
Added missing ndef technology to getTech.
2010-12-06 23:36:09 -08:00
Nick Pelly
934a8f72eb
am 68cea273: am e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
...
* commit '68cea273299e59e28f9ccd87c520cc57cbf5adce':
Added NdefFormatable tag, initial class with supported methods.
2010-12-06 23:36:03 -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
Nick Pelly
7458091ffc
am ea294903: am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
...
* commit 'ea294903ca4c298c44b50b473b9b10ae2b77c9e3':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
2010-12-06 17:48:38 -08:00
Mindy Pereira
d9e37dfacc
Merge "Make webview edges behave the same way abslistview overscroll edges do."
2010-12-06 17:47:11 -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
Adam Powell
11a8af5ea1
Merge "Clean up button bar styles"
2010-12-06 17:41:47 -08:00
Brian Muramatsu
e1d4698ffd
Fix Settings getFloat Methods
...
Don't pass null to Float.parseFloat, because that throws a NPE.
Check for null and throw SettingNotFoundException to fulfill
what the JavaDoc says.
Change-Id: Iff742fb3c15be6e02f29b9dda9197dc05a867924
2010-12-06 17:37:30 -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
Dan Bornstein
8da8fc1f36
Merge "Propagate the concept of "packed opcode" values."
2010-12-06 17:25:44 -08:00
Adam Powell
cf0357639e
Clean up button bar styles
...
Change-Id: I65b6600f72b92db024f83b63d3ea91abc1cbb96c
2010-12-06 17:23:26 -08:00
Mindy Pereira
3331f2be93
Make webview edges behave the same way abslistview overscroll edges do.
...
The assets are not scaled to start before the left or after the
right edge of the view.
For the top edge, start the canvas for rendering the glow
after the title bar (if it is visible) or most of the glow
gets cut off.
Change-Id: Ia1a513fda4d1106d671919bb289aa83f8800c2c2
2010-12-06 17:22:42 -08:00
Jean-Baptiste Queru
4c240a2cd1
am 465e88eb: am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '465e88eb008408d4e655ca7bdd9c2b3ac305e54b':
Changing connect and response timeout.
2010-12-06 16:44:50 -08:00
Dan Bornstein
b96f58911e
Propagate the concept of "packed opcode" values.
...
Dalvik now exposes a distinction between "packed" and regular opcode
values. The packed values are more densely defined in the range 0-0x1ff,
whereas the regular values are sparsely defined across the range 0-0xffff.
The only current use for packed values at this level is in opcode
usage reporting, but their use may expand over time.
Change-Id: Ie783b90cb2dcb9df8f3eb19a7c708a53906fdbe4
2010-12-06 16:02:12 -08:00
Amith Yamasani
acd8d2d2e7
Prevent SearchView dropdown from showing up when SearchView is hidden.
...
Bug: 3257833
2010-12-06 15:50:23 -08:00
Jesse Wilson
ee3567558f
Merge "Test that we use proxies specified by system properties."
2010-12-06 15:24:28 -08:00
Fred Quintana
376ee8263f
Merge "make sure that pending operation reconstituted from disk always have an extras bundle"
2010-12-06 15:18:58 -08:00
Jesse Wilson
10733a71c5
Test that we use proxies specified by system properties.
...
This tests that we use the properties and also that the
precedence prefers client and request properties.
Change-Id: I480dacaf373e3ddd7642d3c918fa50695b36cdba
http://b/3254717
2010-12-06 15:10:11 -08:00
Fred Quintana
5695c7b4e5
make sure that pending operation reconstituted from disk
...
always have an extras bundle
Bug:3226463
Change-Id: I16db632e0be1e75a77853394f716d4c47c08359e
2010-12-06 15:09:32 -08:00
Jean-Baptiste Queru
bfd4c5fe84
Merge "Merge from gingerbread-plus-aosp"
2010-12-06 14:33:03 -08:00
Wei-Ta Chen
b9e56bb345
Merge "Add inPreferQualityOverSpeed into BitmapFactory.Options."
2010-12-06 14:32:32 -08:00
Jean-Baptiste Queru
f0ef665299
Merge from gingerbread-plus-aosp
...
Change-Id: I154071687cdd51c28bb377ea3f1e818e96909b56
2010-12-06 14:31:25 -08:00
Wei-Ta Chen
953f9094a2
Add inPreferQualityOverSpeed into BitmapFactory.Options.
...
The new field allows a developer to use a more accurate by
slightly slower IDCT method in JPEG decode. This in turns improves the
quality of the reconstructed image.
The field by default is not set and thus does not affect existing
applications.
Bug: 3238925
Change-Id: I93d55b7226e47a43e639325cd1a677694d6f2ee4
2010-12-06 14:24:51 -08:00
Jean-Baptiste Queru
50a2a8765a
Merge from gingerbread-plus-aosp
...
Change-Id: I0f4726870be5791e62f98fb45afd82b20f8ffba0
2010-12-06 14:08:53 -08:00
Gilles Debunne
9df964fa3f
Merge "Moved Paste popup window up in TextView"
2010-12-06 13:57:47 -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
Gilles Debunne
1cafde04c5
Moved Paste popup window up in TextView
...
Bug 3228601
A tap on the insertion handle displays the paste popup immediately.
Tapping again hides the popup.
Bug 3248651
Change-Id: I5a501b3ebe36e23cbbf0f1b3d588884c6ecd1d56
2010-12-06 12:37:24 -08:00
Nick Pelly
4704982960
am cbf4e352: am 3d524e56: Merge gingerbread-nfc into gingerbread
...
* commit 'cbf4e3525be80607c4d68630faf927ce6a717f72':
First implementation of MifareUltralight
2010-12-06 11:55:08 -08:00
Nick Pelly
089c3c7c0b
resolved conflicts for merge of 28e8c66d to master
...
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
2010-12-06 11:50:47 -08:00
Daniel Sandler
2ee1856f81
Merge "Hide navigation buttons and clock on lockscreen."
2010-12-06 11:15:45 -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