Sylvain Fonteneau
addd46c658
am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
...
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-29 07:29:56 -08:00
John Wang
6630698e24
am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
...
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
Enable recovery in RIL wakelock release check.
2011-01-29 07:29:42 -08:00
Jean-Baptiste Queru
86e1c5b9f6
Merge c896d85c from gingerbread
...
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
2011-01-29 07:27:06 -08:00
Jean-Baptiste Queru
ac983353e6
Merge da01b4ab from gingerbread
...
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
2011-01-29 07:17:22 -08:00
Jeff Hamilton
6d904e7039
am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
...
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
Allow null filters for foreground dispatch to act as catch all.
2011-01-29 07:09:21 -08:00
Jim Miller
4485edce05
am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
...
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
Fix 3379239: Catch exceptions from workaround for OOM.
2011-01-29 07:08:58 -08:00
Robert Greenwalt
6b739dc729
Merge "Add some network types that OEM's are asking for." into gingerbread
2011-01-29 06:38:35 -08:00
Robert Greenwalt
19eecb028f
Merge "Don't use mobile networktype icon if not connected" into honeycomb
2011-01-29 06:35:57 -08:00
Justin Ho
9b1df1646f
Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
2011-01-28 22:51:51 -08:00
Justin Ho
35326b876e
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
...
Change-Id: Ib78eb3f75b7734c0244fbc9ac58c52d2ffbbdb27
2011-01-28 22:49:43 -08:00
Jeff Brown
2992ea782f
Add "Use physical keyboard" option to system bar IME button.
...
Bug: 3391067
Change-Id: I136087ca4f726d0068d5983d7d3686787ba60c55
2011-01-28 22:06:36 -08:00
Justin Ho
9371f70300
Merge "New honeycomb sound set" into honeycomb
2011-01-28 19:18:51 -08:00
Justin Ho
5f3bbcf554
New honeycomb sound set
...
Change-Id: Iaf3062f57f613702ea946fdf65e02f6265342ad5
2011-01-28 19:15:23 -08:00
Joe Onorato
a0f2cdb507
Merge "999" into honeycomb
2011-01-28 18:47:57 -08:00
Joe Onorato
c6925ca684
999
...
Bug: 3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
2011-01-28 18:46:20 -08:00
Jaikumar Ganesh
e741e5400e
am 1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
...
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
Do Not Merge Connect other profiles when priority is auto connect.
2011-01-28 18:45:14 -08:00
John Reck
4d03f646b4
am 398a589c: (-s ours) Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
...
* commit '398a589ccea744556732b25097412dbb22c51271':
DO NOT MERGE - Create db path if it doesn't exit
2011-01-28 18:44:57 -08:00
Jeff Hamilton
df5d015ae2
resolved conflicts for merge of dc54a8c7 to honeycomb-merge
...
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
2011-01-28 20:41:42 -06:00
Mathias Agopian
231da079c9
Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
2011-01-28 18:38:58 -08:00
Gilles Debunne
f1f409a389
Fxi initial error popup dialog in TextEdit and refreshed assets.
...
Bug 3398923
Set the background of the popup when it is created so that the first
measure is correct.
New assets.
Change-Id: I4803754ef3115429a608d890f56c6b0c8033d253
2011-01-28 18:30:52 -08:00
Mathias Agopian
1723b049c6
fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
...
We were still destroying an ANativeWindow's buffer pretty soon
after it was removed from the window manager. This time
we really wait for the ISurace to go away.
Change-Id: I329273fedaeef76ee92836f6180c2c3808389330
2011-01-28 18:23:24 -08:00
Jamie Gennis
2ece4cdc3f
Reset ANativeWindow crop on buffer geometry changes.
...
This changes the ANativeWindow API and the two implementations to reset
the window's crop rectangle to be uncropped when the window's buffer
geometry is changed.
Bug: 3359604
Change-Id: I64283dc8382ae687787ec0bebe6a5d5b4a0dcd6b
2011-01-28 18:21:54 -08:00
Jason Sams
bd08c7c0c9
Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
2011-01-28 17:56:28 -08:00
Jason Sams
c8f6b6fbbc
Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
2011-01-28 17:56:09 -08:00
Jean-Michel Trivi
0d9209784a
am a314f32b: (-s ours) Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread
...
* commit 'a314f32ba92d46687aef9f420eb61491eff485cf':
Bug 3365937 notify TTS initialization listener of binding errors
2011-01-28 17:37:12 -08:00
Xavier Ducrohet
f597f75039
Merge "LayoutLib: update with Pair API." into honeycomb
2011-01-28 17:21:57 -08:00
Robert Greenwalt
40cdd9b650
Don't use mobile networktype icon if not connected
...
bug:3398345
Change-Id: I0e8beb54e909e02bc551c54d65c5fed8e4e8cb10
2011-01-28 17:17:49 -08:00
Irfan Sheriff
739f6bc675
Keep never as the default wifi sleep settings
...
Bug: 3404049
Change-Id: I824b8cb7b28223cfb4eb89cabc7cb237a4e1e6db
2011-01-28 17:01:29 -08:00
Xavier Ducrohet
b353495192
LayoutLib: update with Pair API.
...
Change-Id: Iba945153f7544872ea84e3311584223aea740e2e
2011-01-28 16:54:15 -08:00
Joe Onorato
430dde3ef3
Merge "Don't force all views to be asking for lights out just because somebody did." into honeycomb
2011-01-28 16:38:01 -08:00
Joe Onorato
957a189bf2
Don't force all views to be asking for lights out just because somebody did.
...
Bug: 3396308
Bug: 3395422
Change-Id: Ic97a689bda12d3b53a6ecace504d411f2beb87d5
2011-01-28 16:36:16 -08:00
Dianne Hackborn
6ec44395f3
Merge "Fix issue #3403539 : WordPress crashes on Honeycomb" into honeycomb
2011-01-28 16:34:02 -08:00
Jim Miller
6354dd0b3e
Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb
2011-01-28 16:21:38 -08:00
Chet Haase
691d43c35f
Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
2011-01-28 16:19:32 -08:00
Jason Sams
62f258f1e4
Clean up RS samples for SDK, bug 2943369
...
Fix bug 3403965 rsgSyncAll would not mark constants as changed
found by inspection.
Only rsAllocation.cpp affects on device bits.
Change-Id: I6b7ec0df87e42687b24384aaf54dc04976cb84f7
doc update
Change-Id: Id5841f08868557e086f185024470924ef202d19f
2011-01-28 16:18:01 -08:00
Jason Sams
35e7026357
DO NOT MERGE
...
Bug 2943369 RS SDK
Remove typedef for quat type which was pushed back to mr1.
Change-Id: Ice2ad6c766ee786105a8d70fc9457a98e19b5af3
2011-01-28 16:18:00 -08:00
Jim Miller
a6b4ffcc60
Fix 3403858: Remove lock icons from status1 area.
...
Change-Id: Ib311f7a9dd4c46965263b3cf72994aab5d2dfb0d
2011-01-28 15:54:49 -08:00
Chet Haase
0dfc398424
Fixed LayoutTransition bug moving multiple views
...
The problem was that there can be >1 animation spawned for each
view in a container, if there are multiple events that trigger
a transition. These animations would potentially clobber object
layout values, causing problems as successive animations tried to use those
clobbered values to set up their own animation values.
The fix is to track the created animations and cancel them as future
animations on those same objects get created. This mechanism used to
be in the code (the bug came about when that mechanism went away), but
was removed because of memory leaks of never removing animations that
were set up but never started. The new approach also caches pending
animations, but runs a second aniamtor to delete the entries in that
collection just in case.
Change-Id: If60c7d188712334dea69d0794dc6b4ce29ca6c09
2011-01-28 15:54:37 -08:00
Eric Fischer
0982dc6488
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-28 15:09:16 -08:00
Justin Ho
20af1c57de
Merge "Correct font size for notifications & control panel." into honeycomb
2011-01-28 15:02:55 -08:00
Eric Fischer
0e77f6dfcb
Import revised translations. DO NOT MERGE
...
Change-Id: I385b9dbf5908ad7030263bc586fba2ebdfe7cf85
2011-01-28 14:54:54 -08:00
Brian Muramatsu
9eaefb8213
Merge "Fix TextUtils#commaEllipsize" into honeycomb
2011-01-28 14:51:10 -08:00
Robert Greenwalt
e12aec941d
Add some network types that OEM's are asking for.
...
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values. Will mark them unhidden in a future sdk release.
bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
2011-01-28 14:48:37 -08:00
Romain Guy
b0c939adfa
Merge "Prevent crash when detaching a SurfaceView. Bug #3400461 " into honeycomb
2011-01-28 14:17:45 -08:00
Jamie Gennis
2a8f8d57d2
Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
2011-01-28 14:12:57 -08:00
Dianne Hackborn
1ec7e20237
Fix issue #3403539 : WordPress crashes on Honeycomb
...
Change-Id: Ia86e26b5bd266d8e3362a04e412a58b98a062d5f
2011-01-28 14:11:17 -08:00
Eric Fischer
5f2def8cfd
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-01-28 14:10:43 -08:00
Gilles Debunne
d11f5d2c5e
Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb
2011-01-28 14:07:12 -08:00
Adam Powell
6b2fda9f4b
Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
2011-01-28 13:58:28 -08:00
Adam Powell
55f3af27ed
Fix bug 3399992 - Make ActionBar menu text styleable
...
Change-Id: Ic67d167c024332575ca3b79725f012a919146286
2011-01-28 13:42:04 -08:00