Mathias Agopian
3cbe436bfd
am 8d778b37: am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
...
* commit '8d778b375ccb4945cdcd7cc93272a6d36466ad00':
fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
2011-01-28 18:43:08 -08:00
Mathias Agopian
daabd7c228
am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
...
* commit '231da079c93664fa7d81c7e957990f17a6334b17':
fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
2011-01-28 18:40:44 -08:00
Mathias Agopian
779160c4ea
Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
2011-01-28 18:38:58 -08:00
Mathias Agopian
3cc2677efc
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
Jason Sams
2948e3b340
am a66b759a: am bd08c7c0: Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
...
* commit 'a66b759ab01c7f1e334d7b9a9f7d78ce3b45ff1c':
Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection.
2011-01-28 18:02:57 -08:00
Christopher Tate
935854d808
Merge "Enable global (cross-application) drag/drop"
2011-01-28 18:01:56 -08:00
Jason Sams
5e8d238dba
am 359113b4: (-s ours) am c8f6b6fb: Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
...
* commit '359113b42ee691749dfe717bb0ead5358045e615':
DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1.
2011-01-28 18:00:46 -08:00
Jason Sams
07eb394e6d
am bd08c7c0: Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
...
* commit 'bd08c7c0c99fa84dbf3c043f4e6dff07320410b7':
Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection.
2011-01-28 18:00:09 -08:00
Jason Sams
c381806ae0
am c8f6b6fb: Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
...
* commit 'c8f6b6fbbc853bd89a7def780e8d9a4cabe6d0e2':
DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1.
2011-01-28 17:58:04 -08:00
Jason Sams
56a764c39c
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
c5b1fe9236
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
Jeff Brown
52d52b4ea1
Merge "Optimize IntentResolver to reduce lookup time by 50%."
2011-01-28 17:55:36 -08:00
Xavier Ducrohet
8695d38b5f
am 115a5dd5: am f597f750: Merge "LayoutLib: update with Pair API." into honeycomb
...
* commit '115a5dd52cd2aafff76ed1e7bea2f5d860a60c2c':
LayoutLib: update with Pair API.
2011-01-28 17:25:35 -08:00
Xavier Ducrohet
02f5e29640
am f597f750: Merge "LayoutLib: update with Pair API." into honeycomb
...
* commit 'f597f750392a26e1bc33430ff52e2dd3674c875b':
LayoutLib: update with Pair API.
2011-01-28 17:23:45 -08:00
Xavier Ducrohet
0f962411f8
Merge "LayoutLib: update with Pair API." into honeycomb
2011-01-28 17:21:57 -08:00
Irfan Sheriff
a4f0627447
am cc1bd4a8: am 739f6bc6: Keep never as the default wifi sleep settings
...
* commit 'cc1bd4a8ea2b171059607a1dbaac65fbfd9a0c04':
Keep never as the default wifi sleep settings
2011-01-28 17:21:18 -08:00
Irfan Sheriff
3a8a479173
am 739f6bc6: Keep never as the default wifi sleep settings
...
* commit '739f6bc675c0caa11a1d46b18de24e6c884f723a':
Keep never as the default wifi sleep settings
2011-01-28 17:19:38 -08:00
Joe Onorato
f13d10edbc
am 9fecc19f: am 430dde3e: Merge "Don\'t force all views to be asking for lights out just because somebody did." into honeycomb
...
* commit '9fecc19f97453cc3ef258100f3a8e323011a7e80':
Don't force all views to be asking for lights out just because somebody did.
2011-01-28 16:42:28 -08:00
Joe Onorato
68e01005f0
am 430dde3e: Merge "Don\'t force all views to be asking for lights out just because somebody did." into honeycomb
...
* commit '430dde3ef3b9b82bfca4ae51e225c6ad88aee514':
Don't force all views to be asking for lights out just because somebody did.
2011-01-28 16:39:44 -08:00
Joe Onorato
a618e56e61
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
Dianne Hackborn
af84874d18
am 7b7280fd: am 6ec44395: Merge "Fix issue #3403539 : WordPress crashes on Honeycomb" into honeycomb
...
* commit '7b7280fd074e598dfa5351cdbef33984b7e36b76':
Fix issue #3403539 : WordPress crashes on Honeycomb
2011-01-28 16:37:13 -08:00
Dianne Hackborn
faec16034b
am 6ec44395: Merge "Fix issue #3403539 : WordPress crashes on Honeycomb" into honeycomb
...
* commit '6ec44395f304a478fb56f20ca5e941514ed0a48e':
Fix issue #3403539 : WordPress crashes on Honeycomb
2011-01-28 16:35:40 -08:00
Dianne Hackborn
8bd4cefdb4
Merge "Fix issue #3403539 : WordPress crashes on Honeycomb" into honeycomb
2011-01-28 16:34:02 -08:00
Jim Miller
dae200773e
am 2e4b9985: am 6354dd0b: Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb
...
* commit '2e4b9985dba629eac5662c32a6684fb7b880aeff':
Fix 3403858: Remove lock icons from status1 area.
2011-01-28 16:28:55 -08:00
Chet Haase
5dcee6ec02
am ec5de087: am 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
...
* commit 'ec5de0874fb32137c117461e5680c83422fba975':
Fixed LayoutTransition bug moving multiple views
2011-01-28 16:26:43 -08:00
Jim Miller
2ea5389b3d
am 6354dd0b: Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb
...
* commit '6354dd0b3e507b2afebc5ba41cd57866ade5ba94':
Fix 3403858: Remove lock icons from status1 area.
2011-01-28 16:26:05 -08:00
Chet Haase
1236140d70
am 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
...
* commit '691d43c35fb953c2f70830d3ebd890a43b54cae3':
Fixed LayoutTransition bug moving multiple views
2011-01-28 16:23:45 -08:00
Jim Miller
11ae43006e
Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb
2011-01-28 16:21:38 -08:00
Chet Haase
bb58b9cc90
Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
2011-01-28 16:19:32 -08:00
Glenn Kasten
ab655cf35f
Merge "Protected surface API"
2011-01-28 15:18:43 -08:00
Eric Fischer
5c353aeff8
am 6a18f6e2: (-s ours) am 0982dc64: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '6a18f6e289f1bd6cdb4a3b73015935fac1c9b11d':
Import revised translations. DO NOT MERGE
2011-01-28 15:13:50 -08:00
Eric Fischer
d2e2cdb567
am 0982dc64: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '0982dc6488a921d9d54d23b9180a9acf33c61526':
Import revised translations. DO NOT MERGE
2011-01-28 15:11:14 -08:00
Eric Fischer
a7442c9587
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-28 15:09:16 -08:00
Justin Ho
fa91187f48
am d1bde71a: am 20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb
...
* commit 'd1bde71ad917218949555724722cdef7139d5ac9':
Correct font size for notifications & control panel.
2011-01-28 15:07:37 -08:00
Justin Ho
e46b080102
am 20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb
...
* commit '20af1c57de9651b93a35b67418263b88bc83f3e4':
Correct font size for notifications & control panel.
2011-01-28 15:05:07 -08:00
Justin Ho
31db9b8551
Merge "Correct font size for notifications & control panel." into honeycomb
2011-01-28 15:02:55 -08:00
Brian Muramatsu
17e76c082e
am 910be3e8: am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb
...
* commit '910be3e855738eab783f2e280b76dcef90a841ec':
Fix TextUtils#commaEllipsize
2011-01-28 14:55:31 -08:00
Brian Muramatsu
1a86374dc3
am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb
...
* commit '9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0':
Fix TextUtils#commaEllipsize
2011-01-28 14:53:07 -08:00
Brian Muramatsu
12ef5792f0
Merge "Fix TextUtils#commaEllipsize" into honeycomb
2011-01-28 14:51:10 -08:00
Romain Guy
56919f3fb6
am 571a2c97: am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461 " into honeycomb
...
* commit '571a2c971b9691f3ace247bf2110efccc782f3ba':
Prevent crash when detaching a SurfaceView. Bug #3400461
2011-01-28 14:22:29 -08:00
Romain Guy
719eda08be
am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461 " into honeycomb
...
* commit 'b0c939adfa339c5cbb7f458072119269368b3ba5':
Prevent crash when detaching a SurfaceView. Bug #3400461
2011-01-28 14:20:01 -08:00
Jamie Gennis
378a3f8001
am a461269d: am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
...
* commit 'a461269d458b29f1e44ba66f6f4ef6b711013705':
Quiet the SurfaceFlingerClient dequeueBuffer error.
2011-01-28 14:18:09 -08:00
Romain Guy
3845b92378
Merge "Prevent crash when detaching a SurfaceView. Bug #3400461 " into honeycomb
2011-01-28 14:17:45 -08:00
Jamie Gennis
e8c431b142
am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
...
* commit '2a8f8d57d23a171eaa367faa143f45fdd2f9cc1c':
Quiet the SurfaceFlingerClient dequeueBuffer error.
2011-01-28 14:15:44 -08:00
Jamie Gennis
155c93ad47
Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
2011-01-28 14:12:57 -08:00
Gilles Debunne
962114fb9d
am 06cedc1c: am d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard." into honeycomb
...
* commit '06cedc1c4a0587389bb1eb360df62b1ec1964bd1':
Fix for TextView's error popup behavior when using soft keyboard.
2011-01-28 14:12:38 -08:00
Gilles Debunne
3546e78bd8
am d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard." into honeycomb
...
* commit 'd11f5d2c5e41b4f2f5bda5ecca793efd2ab2300b':
Fix for TextView's error popup behavior when using soft keyboard.
2011-01-28 14:10:08 -08:00
Gilles Debunne
2948bb3f5f
Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb
2011-01-28 14:07:12 -08:00
Adam Powell
dba4728fea
am 406de58e: am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
...
* commit '406de58e48378bca9ea7e75c61039d243ea81855':
Fix bug 3399992 - Make ActionBar menu text styleable
2011-01-28 14:03:31 -08:00
Adam Powell
304d99871f
am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
...
* commit '6b2fda9f4bcc5c35f605876a5c9da9b226196f5e':
Fix bug 3399992 - Make ActionBar menu text styleable
2011-01-28 14:01:06 -08:00