Gilles Debunne
bfdb926d83
am a5b43a04: am c927ec50: Merge "Overscoll bounce amplitude is smaller." into honeycomb
...
* commit 'a5b43a04921711da8fa09b4f30ff5977f8222954':
Overscoll bounce amplitude is smaller.
2011-01-25 13:49:40 -08:00
Adam Powell
7df04fb2a0
am 41cd1ce1: am f72a13ec: Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb
...
* commit '41cd1ce1b97e48190b47447555560702d0843aba':
Fix bug 3378333 - Holo-style layout for granting permissions
2011-01-25 13:47:27 -08:00
Gilles Debunne
a5b43a0492
am c927ec50: Merge "Overscoll bounce amplitude is smaller." into honeycomb
...
* commit 'c927ec50497bf5f477663deb7b366b37185d46b0':
Overscoll bounce amplitude is smaller.
2011-01-25 13:47:24 -08:00
Adam Powell
41cd1ce1b9
am f72a13ec: Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb
...
* commit 'f72a13ec76517ff0be297f194c88ceb0d84b85e8':
Fix bug 3378333 - Holo-style layout for granting permissions
2011-01-25 13:45:19 -08:00
Gilles Debunne
c927ec5049
Merge "Overscoll bounce amplitude is smaller." into honeycomb
2011-01-25 13:44:32 -08:00
Adam Powell
f72a13ec76
Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb
2011-01-25 13:42:49 -08:00
Adam Powell
c91466f56a
Fix bug 3378333 - Holo-style layout for granting permissions
...
Change-Id: Ie1bb925db3ddd8343c9756e220a0d821f4d31c6d
2011-01-25 13:34:28 -08:00
Vasu Nori
4d724546e4
Merge "add extra prams to intent to start Download App in sort-by-size mode"
2011-01-25 12:50:27 -08:00
Amith Yamasani
81195336fa
am 7abd7429: am 6bcbf54f: Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb
...
* commit '7abd7429d6a43c139daf8dc5eba22e18404e1232':
Heed the focusability flag in SearchView and set the default to true.
2011-01-25 12:41:34 -08:00
Amith Yamasani
7abd7429d6
am 6bcbf54f: Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb
...
* commit '6bcbf54feed8ca7c1bf9b509f8581684988d45dd':
Heed the focusability flag in SearchView and set the default to true.
2011-01-25 12:38:40 -08:00
Amith Yamasani
6bcbf54fee
Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb
2011-01-25 12:35:06 -08:00
Amith Yamasani
7f8aef6d5b
Heed the focusability flag in SearchView and set the default to true.
...
Bug: 3385804
Also, allow navigation through keyboard.
Change-Id: I444f142518172b35f33c2a5129179ac996d80dc7
2011-01-25 12:10:56 -08:00
Vasu Nori
e5f92249f1
add extra prams to intent to start Download App in sort-by-size mode
...
Change-Id: Icedf50477681bc79582517500748b9a916121903
2011-01-25 11:49:30 -08:00
Gilles Debunne
3971b8cd52
am 2b5a62af: am 2a32a39e: Merge "Removed warnings in DynamicLayout" into honeycomb
...
* commit '2b5a62afdef5efc47e223057de0c867ffafef22d':
Removed warnings in DynamicLayout
2011-01-25 11:38:33 -08:00
Gilles Debunne
2b5a62afde
am 2a32a39e: Merge "Removed warnings in DynamicLayout" into honeycomb
...
* commit '2a32a39e9a0455732724bbbbbdce41e12a8ffb1e':
Removed warnings in DynamicLayout
2011-01-25 11:36:21 -08:00
Gilles Debunne
2a32a39e9a
Merge "Removed warnings in DynamicLayout" into honeycomb
2011-01-25 11:34:19 -08:00
Gilles Debunne
8ce7aab79e
Overscoll bounce amplitude is smaller.
...
Per Dan's request for poor behavior on low speed Overscrolls.
Change-Id: I184133df5e6cc68d8d9bf39edb62d42e13d27a90
2011-01-25 11:23:30 -08:00
Brian Carlstrom
aa16a0f357
am f2b7c844: am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
...
* commit 'f2b7c84468c5397b44566c393bec2675d73817b7':
Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
2011-01-25 11:03:52 -08:00
Nick Pelly
c1c93d647a
am 894983f0: am 3b61e47a: am b134223f: Make Mifare Classic increment/decrement operands little endian
...
* commit '894983f060b8e296335c50165049747d0a33fbc0':
Make Mifare Classic increment/decrement operands little endian
2011-01-25 11:03:35 -08:00
Brian Carlstrom
f2b7c84468
am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
...
* commit '8d37c4efeb853fdc6626f89b5bc0ec79eb451162':
Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
2011-01-25 11:00:24 -08:00
Nick Pelly
894983f060
am 3b61e47a: am b134223f: Make Mifare Classic increment/decrement operands little endian
...
* commit '3b61e47a3f173133e5a3cfcbfe6812eb02a0a760':
Make Mifare Classic increment/decrement operands little endian
2011-01-25 10:58:46 -08:00
Brian Carlstrom
8d37c4efeb
Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
2011-01-25 10:58:02 -08:00
Gilles Debunne
9854161e8f
am 9eaa9b97: am b6b15dca: Merge "TextLine cache is used, even for long lines of text." into honeycomb
...
* commit '9eaa9b97d78e3efed1ac497822ca06c03db890cd':
TextLine cache is used, even for long lines of text.
2011-01-25 10:47:33 -08:00
Gilles Debunne
9eaa9b97d7
am b6b15dca: Merge "TextLine cache is used, even for long lines of text." into honeycomb
...
* commit 'b6b15dca725b3467ea03fa4c0ae29e6b6e753b27':
TextLine cache is used, even for long lines of text.
2011-01-25 10:45:15 -08:00
Gilles Debunne
b6b15dca72
Merge "TextLine cache is used, even for long lines of text." into honeycomb
2011-01-25 10:43:05 -08:00
Shimeng (Simon) Wang
e59b34cfbf
am 1dc6b9eb: am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
...
* commit '1dc6b9ebc6ea584b8294e920d0153365c6aa2486':
Set high usage delta to 1 to avoid constant V8 GC.
2011-01-25 10:34:50 -08:00
Sylvain Fonteneau
d8e4c1b3b2
am a2eced30: am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
...
* commit 'a2eced302b7a5c4fea6d84c200dbdc5555f0d2b5':
Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-25 10:32:35 -08:00
Shimeng (Simon) Wang
1dc6b9ebc6
am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
...
* commit 'c1e7f2d371aa6c2aa9ed3207689cb53a1f704cbc':
Set high usage delta to 1 to avoid constant V8 GC.
2011-01-25 10:30:33 -08:00
Nick Pelly
cf1f20e701
am fd06cc10: resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
...
* commit 'fd06cc10ac372a737e37e764b0a01296e778226e':
Add operands to mifare classic increment, decrement.
2011-01-25 10:30:11 -08:00
Sylvain Fonteneau
a2eced302b
am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
...
* commit 'e97a42e05cced70dd5713c731a197187b4751800':
Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-25 10:29:51 -08:00
Shimeng (Simon) Wang
c1e7f2d371
Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
2011-01-25 10:27:24 -08:00
Nick Pelly
fd06cc10ac
resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
...
Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b
2011-01-25 10:26:54 -08:00
Nick Pelly
866264fa26
am bdd265ba: resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
...
* commit 'bdd265ba5fe6b2bf632a7a6eb6df9e187a56126a':
Make MifareClassic methods more consistent.
2011-01-25 10:22:41 -08:00
Nick Pelly
bdd265ba5f
resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
...
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
2011-01-25 10:20:02 -08:00
Gilles Debunne
d6e568c4f3
Removed warnings in DynamicLayout
...
Change-Id: Ied1c330795412d0bdcac1236b466951112fabc7d
2011-01-25 10:14:43 -08:00
Jeff Hamilton
7a7cde6de1
am 883b26db: am 535ec16c: am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
...
* commit '883b26db47fc1bfdc29963b6987866de0ed318cd':
Allow null filters for foreground dispatch to act as catch all.
2011-01-25 10:08:56 -08:00
John Reck
746e063c83
am 500c9e99: am 7f532976: Merge "Docs for Origin" into honeycomb
...
* commit '500c9e99f514bd6b3df9b04ed10a763ea752c138':
Docs for Origin
2011-01-25 10:05:34 -08:00
Nick Pelly
8bfdd9a651
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
2011-01-25 10:03:46 -08:00
Jeff Hamilton
883b26db47
am 535ec16c: am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
...
* commit '535ec16c78eada2d32669f5a2f8e3c227a5beecc':
Allow null filters for foreground dispatch to act as catch all.
2011-01-25 10:03:17 -08:00
John Reck
500c9e99f5
am 7f532976: Merge "Docs for Origin" into honeycomb
...
* commit '7f532976baa54d2935a8ba42cc2c529b7460e57a':
Docs for Origin
2011-01-25 10:03:14 -08:00
John Reck
7f532976ba
Merge "Docs for Origin" into honeycomb
2011-01-25 10:01:16 -08:00
Shimeng (Simon) Wang
7c1bcfddcd
Set high usage delta to 1 to avoid constant V8 GC.
...
This value will be passed to native webkit to V8.
3 consecutive dromaeo DOM core are run, there's no crash.
Because of assets change, Passion browser can't be run; this will
need to be checked in I release, I think
issue: 3317722
Change-Id: Ifa6e4116f76f395d98db9f8336f91dc9de6bf125
2011-01-25 09:55:11 -08:00
Jesse Wilson
a16e38f156
Merge "Prefer the overload of getDigestAlgorithm spelled correctly."
2011-01-25 09:44:24 -08:00
Jesse Wilson
66e40c36b3
Prefer the overload of getDigestAlgorithm spelled correctly.
...
Change-Id: Iaf1c031b982890c2ef21607bdf80acd652646e19
2011-01-25 09:40:57 -08:00
Gilles Debunne
f902d7bc49
TextLine cache is used, even for long lines of text.
...
Bug 3381368
The 250 characters limit is passed for long URLs. There are only 3
TextLine objects, so their total size is not an issue. Recycle long
lines as well to make sure we fill the cache and avoid object creation.
Change-Id: I843bf623594312a0fcf0edbb13b7cd64cce0ddd1
2011-01-25 09:09:46 -08:00
Nick Pelly
3b61e47a3f
am b134223f: Make Mifare Classic increment/decrement operands little endian
...
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
Make Mifare Classic increment/decrement operands little endian
2011-01-25 08:41:35 -08:00
Nick Pelly
b134223f91
Make Mifare Classic increment/decrement operands little endian
...
Also make sure they are non-negative.
This is not documented in Mifare Classic spec, but based on findings from NXP:
- Operand should be stored in little-endian format in the transceive buffer
- Tag ignores the sign bit on the operand, its effectively 31-bit unsigned
- Overflow and underflow generates an error.
Change-Id: Id3389b3894ded732c4b00d564ca53f5df651359e
2011-01-25 07:45:07 -08:00
Ken Wakasa
6a05139af1
am 901a8193: am 24a0b71a: Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb
...
* commit '901a81933415811d011d1596a3e2bd65ed2d490e':
Clip touch event at SoftInputWindow to handle the event from Inset
2011-01-25 07:37:33 -08:00
Ken Wakasa
901a819334
am 24a0b71a: Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb
...
* commit '24a0b71a67ca98fbb94ff6ff321acb155d8a1014':
Clip touch event at SoftInputWindow to handle the event from Inset
2011-01-25 07:28:12 -08:00
Ken Wakasa
24a0b71a67
Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb
2011-01-25 05:42:36 -08:00