Romain Guy
3ac1b0f0d4
Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339 " into honeycomb
2011-01-25 13:55:14 -08:00
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
Jaikumar Ganesh
dde68c64fd
Rename virtual call API to ScoUsingVirtualCall.
...
This API makes more sense with regard to headset profile.
Bug: 3381532
Change-Id: Ife07d101a3b04bcddb31e7ae86712e1d97a660c5
2011-01-25 13:49:35 -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
Gilles Debunne
d9ed795ca5
Fix for a call to startActivity from outside of an app.
...
Bug 3246715
Regression introduced by https://android-git.corp.google.com/g/#change,86174
Change-Id: Icba170746d196386bd9b0309582f724cb076d937
2011-01-25 13:40:06 -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
Jeff Brown
30bc34f191
Fix surface frame size reporting.
...
The SurfaceHolder provided by the wallpaper service was not reporting
the correct size in getSurfaceFrame(). This broke an optimization in
the ImageWallpaper. The old code happened to work because calling
lockCanvas on the SurfaceHolder with a null dirty rectangle happened
to have the side-effect of updating the SurfaceHolder's surface frame
size field because it passed mSurfaceFrame as the dirty rect, causing
mSurfaceFrame to be set to the size of the region to be drawn.
However, relying on this side-effect is wrong. Among other things,
the dirty region could actually be smaller than the surface frame.
This patch fixes WallpaperService, SurfaceView and ViewRoot to ensure
that the surface frame size is always set explicitly and is not modified
by calls to lockCanvas.
Change-Id: I10948f5ec269409ceaf0f7d32b3f6731e9499ebc
2011-01-25 13:10:30 -08:00
Romain Guy
6e81e57b52
Prevent crash in View when gathering attributes without an AttachInfo.
...
Bug #3385339
Change-Id: I06b6f03721b52ab0b9d13c2fb3e133ae25d99970
2011-01-25 12:59:00 -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
Nick Pelly
0c57adce34
am f54ad8da: Clean up transceive().
...
* commit 'f54ad8daf6f9dc2b9670ab1abbbfa4308b40bc6a':
Clean up transceive().
2011-01-25 12:39:25 -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
Jeff Hamilton
4f1b04ac47
resolved conflicts for merge of 0aea1836 to honeycomb-merge
...
Change-Id: I5aa17ff6dc9037815c3ec3e6e4b18183aedbbdf2
2011-01-25 14:35:55 -06: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
Patrick Scott
85b69e0390
Turn off picture splitting for now.
...
Splitting the content was causing a mismatch between the base content picture
and composited layers. It was also happening on every single inval.
Bug: 3372320
Change-Id: I09da2d0f3cba028c355ceba2b4c8e34da5a77028
2011-01-25 15:19:45 -05: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
Dianne Hackborn
7187ccb93e
Fix issue #3385839 : Fragment.onCreateView is passing in activity...
...
...context for a DialogFragment
Change-Id: I434ebca64d2738da4c27321db8dbbded2cbe167d
2011-01-25 11:28:39 -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
Dianne Hackborn
93dd6a6ad1
am 3ea5728e: Tweak level at which we reset battery stats to 90%.
...
* commit '3ea5728e703554f8ba0bb3aa1367d6dc45d704bb':
Tweak level at which we reset battery stats to 90%.
2011-01-25 10:45: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
Arnaud Ferir
eed0f2c22d
am 0d128912: am 10ab8617: am 5e81a6e2: Fix trace mismatch.
...
* commit '0d1289122c2215add91cb86d520a72fd0815b6b6':
Fix trace mismatch.
2011-01-25 10:32:39 -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
Arnaud Ferir
0d1289122c
am 10ab8617: am 5e81a6e2: Fix trace mismatch.
...
* commit '10ab8617e85c9a675ff8251cd328beb4e047777c':
Fix trace mismatch.
2011-01-25 10:29:59 -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
Jim Miller
0a2a4addd4
am 00e37916: am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
...
* commit '00e37916bc121cea928f6bad6d059cbd00e8bf6b':
Fix 3379239: Catch exceptions from workaround for OOM.
2011-01-25 10:08:38 -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