Jamie Gennis
3eb70b4a51
am bd340c7b: am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
...
* commit 'bd340c7b492fcf7d0a6cccab8825e710c83fe76d':
SurfaceFlinger: Fix a typo.
2011-03-18 17:38:37 -07:00
Jamie Gennis
09bb22afae
am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
...
* commit 'b368f4d85d8b5e567f605c991a6c5c6ff1c868d8':
SurfaceFlinger: Fix a typo.
2011-03-18 17:36:51 -07:00
Jamie Gennis
560fe009e5
am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
...
* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
SurfaceFlinger: Fix a typo.
2011-03-18 17:34:27 -07:00
Jamie Gennis
d32a694a0c
Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
2011-03-18 17:32:25 -07:00
Svetoslav Ganov
ccd1c86b93
Merge "Text in accessibility events not consistent"
2011-03-18 17:16:14 -07:00
Romain Guy
1aee826614
Merge "Fix hairline rendering."
2011-03-18 17:15:12 -07:00
Jason Sams
f137a73050
Merge "Fix bug with hal init uninitialized var."
2011-03-18 17:10:09 -07:00
Eric Fischer
5c657f7e4e
am cfb05dc6: (-s ours) am 9ac82606: (-s ours) am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'cfb05dc67e4fd8c0c078d31bf5404ad915b80030':
Import revised translations. DO NOT MERGE
2011-03-18 16:58:44 -07:00
Eric Fischer
0c8f2bd227
am 9ac82606: (-s ours) am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '9ac8260608224f182ac5a20e50ce4352334a09ba':
Import revised translations. DO NOT MERGE
2011-03-18 16:53:45 -07:00
Romain Guy
60e8d2a082
Merge "Correctly apply filters to Alpha8 bitmaps."
2011-03-18 16:51:17 -07:00
Jamie Gennis
5fd799dab6
SurfaceFlinger: Fix a typo.
...
This change makes Layer skip its cleanup of its old shared memory region
when the UserClient object that owned the memory has been freed.
Bug: 3429357
Change-Id: I9e4d8eb190f6914dc043674b9bb8dd28e959901b
2011-03-18 16:35:13 -07:00
Svetoslav Ganov
f0af2b4404
Merge "ProgressBar does not fire accessibility events on update."
2011-03-18 16:26:41 -07:00
Romain Guy
c51ab3f545
Merge "Fix paths rendering issues."
2011-03-18 16:26:11 -07:00
Adam Powell
bc581b5a2a
Merge "Fix bug 4136005 - Extended menus do not work"
2011-03-18 16:16:43 -07:00
Eric Fischer
eefe09b7df
am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'c0604255a71c0b7114c3f011519160d4812a8100':
Import revised translations. DO NOT MERGE
2011-03-18 16:06:41 -07:00
Andreas Huber
9c9f264440
Merge "Squashed commit of the following:"
2011-03-18 16:03:40 -07:00
Russell Brenner
21b1cc0b64
am 2a102cce: (-s ours) am e68dc157: am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491 " into honeycomb-mr1
...
* commit '2a102ccecdf2580d01847f09e6b431ce7e3bc8bc':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
2011-03-18 15:51:00 -07:00
Russell Brenner
dee4e7fab1
am e68dc157: am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491 " into honeycomb-mr1
...
* commit 'e68dc1576f2a27de17da41129778df331cda1f3f':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
2011-03-18 15:34:49 -07:00
James Dong
b5f1151882
Merge "Better organize media recorder error and information event and types"
2011-03-18 15:33:11 -07:00
Russell Brenner
bd7b09f841
am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491 " into honeycomb-mr1
...
* commit 'a0dc8da2ab0a084432c7094e434b7957dd2eaf5c':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
2011-03-18 15:32:18 -07:00
Teng-Hui Zhu
fdafdb4fb3
am fa1b09a7: am eb52fb32: am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
...
* commit 'fa1b09a7b3f546bd5b30233b1e3f62a6fa7d4a4b':
Asset for video poster
2011-03-18 15:30:34 -07:00
Russell Brenner
b36926abde
Merge "DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491 " into honeycomb-mr1
2011-03-18 15:28:27 -07:00
Teng-Hui Zhu
f5c2f676e6
am eb52fb32: am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
...
* commit 'eb52fb32297219efbd6add01586f06f32b260c58':
Asset for video poster
2011-03-18 15:27:22 -07:00
Eric Fischer
d2cd24d8ce
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-18 15:22:05 -07:00
Teng-Hui Zhu
3b9b781405
am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
...
* commit '7eaf483140f1c42f29c7cde71061521280b253ce':
Asset for video poster
2011-03-18 15:22:03 -07:00
Teng-Hui Zhu
c53cb0d36c
Merge "Asset for video poster" into honeycomb-mr1
2011-03-18 15:19:28 -07:00
Svetoslav Ganov
a9a448efc4
Merge "DatePicker does not respect the user preference of date format"
2011-03-18 14:48:03 -07:00
Eric Laurent
693ef00d54
Merge "Fix issue 4111672: AudioTrack control block flags"
2011-03-18 14:43:41 -07:00
Romain Guy
bce3a5f51b
Merge "Optimize rect-shaped layers."
2011-03-18 14:37:48 -07:00
James Dong
2f7c3607cf
Merge "Handle display dimension scaling event due to SAR embedded in AVC videos"
2011-03-18 13:45:37 -07:00
Andreas Huber
c9a8a8ce66
Merge "Signal a runtime error if the AVCDecoder encounters an invalid frame."
2011-03-18 13:22:25 -07:00
Dianne Hackborn
88d84f82c2
Merge "More work on making prefs work well on small screens."
2011-03-18 12:55:46 -07:00
Daisuke Miyakawa
b69f99defe
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
3f7e2b5179
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
bf4b3f73ce
am b02d3956: am e16a1bfa: Use system locale list.
...
* commit 'b02d395650a9a5fb13812cefa0ada1501f5b6d62':
Use system locale list.
2011-03-18 11:27:22 -07:00
Derek Sollenberger
c82c5b0bb3
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
ff6b2fcc9e
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
d338153e97
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
6f4012bb83
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
48a27defe9
am e16a1bfa: Use system locale list.
...
* commit 'e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
Use system locale list.
2011-03-18 11:23:00 -07:00
Derek Sollenberger
529f878975
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
e6fb416547
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
800094d7d1
Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
2011-03-18 10:57:46 -07:00
shailendra
886c92028f
Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
2011-03-18 09:35:37 -07:00
Valentin Kravtsov
c211c766be
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
9f198e5598
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
a06b350e55
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
16f5cc4c58
Merge "Fixing a race condition in RecognitionService" into gingerbread
2011-03-18 08:49:51 -07:00
Jeff Brown
f98f1364f8
Merge "Refactor how timeouts are calculated."
2011-03-17 20:16:42 -07:00
Dianne Hackborn
e5e02aac29
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