Romain Guy
bb8c820bd0
Merge "Optimize rect-shaped layers."
2011-03-18 14:37:48 -07:00
Romain Guy
40667676e5
Optimize rect-shaped layers.
...
This brings back an optimization disabled in HC-MR1. This time the
correct geometry is generated to avoid unnecessary blending.
Change-Id: Id56404dc46bb84c75facc25c18488a690741b592
2011-03-18 14:36:44 -07:00
James Dong
01f20f6b37
Merge "Handle display dimension scaling event due to SAR embedded in AVC videos"
2011-03-18 13:45:37 -07:00
James Dong
7e91d91a4f
Handle display dimension scaling event due to SAR embedded in AVC videos
...
bug - 3379293
Change-Id: I03cb548e61d31bc0a2fb40916d207aaf840fafce
2011-03-18 13:43:45 -07:00
Andreas Huber
7af86edfe1
Merge "Signal a runtime error if the AVCDecoder encounters an invalid frame."
2011-03-18 13:22:25 -07:00
Dianne Hackborn
cf3deb51a2
Merge "More work on making prefs work well on small screens."
2011-03-18 12:55:46 -07:00
Dianne Hackborn
e72f237def
More work on making prefs work well on small screens.
...
Tweak padding so layouts now look decent, a few extensions so that
the correct title can be shown.
Change-Id: Ieace16bf4962d66564c6e2f67fb588e582943850
2011-03-18 12:54:26 -07:00
Andreas Huber
b8fdab2b70
Signal a runtime error if the AVCDecoder encounters an invalid frame.
...
Instead of asserting.
Change-Id: I4c89f5fef92e5adb11d1ea6b564a67e99fc96595
related-to-bug: 4109304
2011-03-18 11:40:20 -07:00
Daisuke Miyakawa
21c83b4d9f
am f15b3db3: am 10221a22: am b02d3956: am e16a1bfa: Use system locale list.
...
* commit 'f15b3db3eb69683d23f379697cf86f8487845847':
Use system locale list.
2011-03-18 11:31:10 -07:00
Daisuke Miyakawa
f15b3db3eb
am 10221a22: am b02d3956: am e16a1bfa: Use system locale list.
...
* commit '10221a22ddb8f9ffaed52dfb4e0e30bc9d2f75b0':
Use system locale list.
2011-03-18 11:29:04 -07:00
Daisuke Miyakawa
10221a22dd
am b02d3956: am e16a1bfa: Use system locale list.
...
* commit 'b02d395650a9a5fb13812cefa0ada1501f5b6d62':
Use system locale list.
2011-03-18 11:27:22 -07:00
Derek Sollenberger
e4af0ed6b3
am 0c8e22b1: am 25dad8ed: am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
...
* commit '0c8e22b1d3dbcd4580db2a288af65fcca10cde1b':
Prevent intermediate scale updates from being sent to WebKit while zooming.
2011-03-18 11:27:12 -07:00
shailendra
0e898b59d8
am e21bbd24: am a5eaf2ea: am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
...
* commit 'e21bbd24a107c3286e8c6f3eca069ebb12ef13da':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:27:09 -07:00
Derek Sollenberger
0c8e22b1d3
am 25dad8ed: am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
...
* commit '25dad8eda13d70a2473cde735042d083a578fb48':
Prevent intermediate scale updates from being sent to WebKit while zooming.
2011-03-18 11:23:51 -07:00
shailendra
e21bbd24a1
am a5eaf2ea: am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
...
* commit 'a5eaf2eae0d11c45d9167f7fcadaafdeefad645c':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:23:47 -07:00
Daisuke Miyakawa
b02d395650
am e16a1bfa: Use system locale list.
...
* commit 'e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
Use system locale list.
2011-03-18 11:23:00 -07:00
Derek Sollenberger
25dad8eda1
am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
...
* commit '5750bb7d8f59c0f8e18baaa60bcb492c867db590':
Prevent intermediate scale updates from being sent to WebKit while zooming.
2011-03-18 11:02:45 -07:00
shailendra
a5eaf2eae0
am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
...
* commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:02:35 -07:00
Derek Sollenberger
5750bb7d8f
Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
2011-03-18 10:57:46 -07:00
Derek Sollenberger
a249a93e8d
Prevent intermediate scale updates from being sent to WebKit while zooming.
...
The addition of the HW accelerated logic causes us to manipulate the
zoom scale factor in the zoom manager two additional times. These
manipulations occur after the mZoomScale has been set to zero is how we
previously tested to see if a fixed length animation was occuring.
bug: 3451126
Change-Id: If2992adbe36fa471bb1bb5013495e1adc74b5fab
2011-03-18 12:48:36 -04:00
shailendra
0d922ec92d
Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
2011-03-18 09:35:37 -07:00
Valentin Kravtsov
b18a047de5
am d35f9390: am 000466d7: am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
...
* commit 'd35f939010cb889d0e5d757f2e3f76c5b50b419a':
Fixing a race condition in RecognitionService
2011-03-18 09:27:56 -07:00
Valentin Kravtsov
d35f939010
am 000466d7: am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
...
* commit '000466d79d33fa302c6c8d20d2db45faca7c31e0':
Fixing a race condition in RecognitionService
2011-03-18 09:15:49 -07:00
Valentin Kravtsov
000466d79d
am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
...
* commit '125be9c85a3bf71add2841d4195905c1e681a83e':
Fixing a race condition in RecognitionService
2011-03-18 09:04:33 -07:00
Valentin Kravtsov
125be9c85a
Merge "Fixing a race condition in RecognitionService" into gingerbread
2011-03-18 08:49:51 -07:00
Jeff Brown
6ed6f6d82d
Merge "Refactor how timeouts are calculated."
2011-03-17 20:16:42 -07:00
Daisuke Miyakawa
e16a1bfa9c
Use system locale list.
...
Context's assets may be different from system's. We should
prefer system's to reflect PRODUCT_LOCALE.
Bug: 4104675
Change-Id: I968c3baf6bfeb945f1b71ec709d5088332482319
2011-03-17 19:56:13 -07:00
Dianne Hackborn
315f19be8e
am daa71254: am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit 'daa71254f3e3261ecc0e143955c89ced70bbf008':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:07:17 -07:00
Dianne Hackborn
daa71254f3
am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit 'efb56934efdc0aae38ce7264f2576326293846b6':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:05:08 -07:00
Dianne Hackborn
efb56934ef
am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit '1d50ad7914de36b63a04d39bdc4791c1dadc7eae':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:02:15 -07:00
Dianne Hackborn
955652596e
Merge "AsyncTask now uses the poll executor for apps up through HC MR1 and the serialized one after that."
2011-03-17 19:02:11 -07:00
Dianne Hackborn
1d50ad7914
Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
2011-03-17 19:00:56 -07:00
Huahui Wu
45a746a107
am f5cf85d0: am d1e89c41: am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
...
* commit 'f5cf85d07c99ae834d1b58bf5109982f9a4f3604':
b/4116658 Fix the jumpy scrolling with some flash site.
2011-03-17 18:47:21 -07:00
Joe Onorato
d630f105e8
AsyncTask now uses the poll executor for apps up through HC MR1 and the serialized one after that.
...
Change-Id: I47d135ace5f8e78e4fa44ac9d1bf7abeeb9d3ba0
2011-03-17 18:42:26 -07:00
Dianne Hackborn
edf1fc6ce6
Whoops, forgot the HONEYCOMB_MR1 constant. :(
...
It shouldn't be a problem to put this in -- it is a static final
so it doesn't actually need to be in the on-device system image.
This is important for the SDK.
Change-Id: Iaa086247d0d65fe708c40fbab506aa60cd3e1396
2011-03-17 18:34:48 -07:00
Jason Sams
37e96a1566
Merge "Migrate thread launch to driver."
2011-03-17 18:20:09 -07:00
Jason Sams
1c14bcf760
Merge "Start seperating out RS compute implementation. Create hal layer to seperate from runtime."
2011-03-17 18:19:56 -07:00
Huahui Wu
f5cf85d07c
am d1e89c41: am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
...
* commit 'd1e89c412ff10345cd217ae3d1bb1e780d56dbaa':
b/4116658 Fix the jumpy scrolling with some flash site.
2011-03-17 18:13:16 -07:00
Huahui Wu
d1e89c412f
am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
...
* commit 'b1c43c32f518240fd75963ffc8e82cb13e036390':
b/4116658 Fix the jumpy scrolling with some flash site.
2011-03-17 18:11:04 -07:00
Huahui Wu
b1c43c32f5
Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
2011-03-17 18:09:33 -07:00
Wink Saville
f0aad65c10
am d2cc7d55: am 94191d43: am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1
...
* commit 'd2cc7d5543bf39e9caa444efc44e74d5ae2188a5':
Change stopship to todo.
2011-03-17 18:07:22 -07:00
Justin Ho
e20efeb675
am 93b1a4dd: am dd8f9268: am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
...
* commit '93b1a4dd97574da7de2f6c589d5c84f91829cd9a':
Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
2011-03-17 18:06:55 -07:00
James Dong
2120617f2f
am 14438b81: am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
...
* commit '14438b81a1fe4d7ebdf8977f3d80a1dd1867c5ad':
Fix missing AOSP copyright headers for more files
2011-03-17 18:06:51 -07:00
Wink Saville
d2cc7d5543
am 94191d43: am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1
...
* commit '94191d43491a38305ca17456a9b806e58fbda99d':
Change stopship to todo.
2011-03-17 18:03:53 -07:00
Wink Saville
94191d4349
am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1
...
* commit '651f38d71788d6b1d50cb6c9810ba31f903407d9':
Change stopship to todo.
2011-03-17 18:00:55 -07:00
Justin Ho
93b1a4dd97
am dd8f9268: am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
...
* commit 'dd8f9268415de539b9b17a9b7d24405b50d9c053':
Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
2011-03-17 18:00:23 -07:00
James Dong
14438b81a1
am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
...
* commit '970bad677585b3cba1ff1b48db9040c2005bd907':
Fix missing AOSP copyright headers for more files
2011-03-17 18:00:19 -07:00
Wink Saville
651f38d717
Merge "Change stopship to todo." into honeycomb-mr1
2011-03-17 17:58:06 -07:00
Justin Ho
dd8f926841
am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
...
* commit '5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc':
Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
2011-03-17 17:55:58 -07:00
James Dong
970bad6775
am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
...
* commit 'be368de7b7614e89bae8fb59ea4283eba890a2c1':
Fix missing AOSP copyright headers for more files
2011-03-17 17:55:48 -07:00