Robert Greenwalt
d9187088f6
resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp
...
Change-Id: Ib9d24c211461329955288180978a7c5d383bba75
2011-01-28 09:06:30 -08:00
Xavier Ducrohet
35b4ca134e
am a3e586af: Merge "LayoutLib: Properly compute available space to layouts." into honeycomb
...
* commit 'a3e586af439137eb4216bc7ba62167f516e028c2':
LayoutLib: Properly compute available space to layouts.
2011-01-27 15:53:46 -08:00
Xavier Ducrohet
c6b6db8a3f
Merge "LayoutLib: Properly compute available space to layouts." into honeycomb
2011-01-27 15:51:13 -08:00
Justin Ho
d68f589f80
am 0a5481db: Merge "Pushing in fixed scrubber asset" into honeycomb
...
* commit '0a5481db2256651ffe75e0f6e7e01b333ea5df3f':
Pushing in fixed scrubber asset
2011-01-27 15:50:26 -08:00
Justin Ho
8721c05c35
am c1913ecc: Merge "Removing old pocket assets" into honeycomb
...
* commit 'c1913eccb15513a1b75928131649ff93eaaeedb3':
Removing old pocket assets
2011-01-27 15:48:22 -08:00
Justin Ho
b0c5d3154f
Merge "Pushing in fixed scrubber asset" into honeycomb
2011-01-27 15:47:31 -08:00
Justin Ho
24b2bf8a50
Merge "Removing old pocket assets" into honeycomb
2011-01-27 15:46:45 -08:00
Romain Guy
a1e75510a8
am 0250bc2f: Merge "Catch exception when ViewRoot\'s surface is not valid. Bug #3399426 " into honeycomb
...
* commit '0250bc2faca14a332155b9111e0ee5dfc8493d6a':
Catch exception when ViewRoot's surface is not valid. Bug #3399426
2011-01-27 15:43:03 -08:00
Romain Guy
651aec0b42
Merge "Catch exception when ViewRoot's surface is not valid. Bug #3399426 " into honeycomb
2011-01-27 15:41:08 -08:00
Derek Sollenberger
a6a9c1bf38
am 8f9fb947: Merge "Add Plugin API for controling the device power states" into honeycomb
...
* commit '8f9fb94741b5032c8774f87130133ef14d9af4e2':
Add Plugin API for controling the device power states
2011-01-27 15:28:52 -08:00
Derek Sollenberger
3d8744d182
Merge "Add Plugin API for controling the device power states" into honeycomb
2011-01-27 15:26:53 -08:00
Basavapatna Dattaguru
00ab983eb2
am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb
...
* commit '64a2c359aeda59e4bc43d48f31ade919e918ea26':
Fix Issue: 3373525: reduces app. 100mS in create
2011-01-27 15:03:36 -08:00
Adam Powell
6d255df7fe
am 43d7b83e: Merge "Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info" into honeycomb
...
* commit '43d7b83ed92d54eeaf81e8e8b554daee1741df7b':
Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info
2011-01-27 15:03:22 -08:00
Gilles Debunne
897cd64f89
am 6f7a6bc3: Merge "Soft keyboard is not shown when text selection mode is aborted." into honeycomb
...
* commit '6f7a6bc3454fce5cfb86a0fc6a37022d24d1e465':
Soft keyboard is not shown when text selection mode is aborted.
2011-01-27 15:03:19 -08:00
Huahui Wu
9d637bf974
am cbcdc614: Merge "b/3347670 Support installing online certs to the system keystore." into honeycomb
...
* commit 'cbcdc6147aa7dd4bcfcdaae6fc673c68f9be5dcf':
b/3347670 Support installing online certs to the system keystore.
2011-01-27 15:02:09 -08:00
Justin Ho
e9fcf89830
am c7b032d9: Fixing download notification icons
...
* commit 'c7b032d95bfae8b956dd4da8b6cbbd94ab534137':
Fixing download notification icons
2011-01-27 15:01:54 -08:00
Vasu Nori
ab1fd7fc12
am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
...
* commit 'ce3b35a7b0b80061692d9fa1977cee68b365728c':
bug:3398527 return List insttead of ArrayList from public API
2011-01-27 15:00:38 -08:00
Daniel Sandler
cf69a11bf9
am 74d39bd9: Merge "Correct the translationY of the empty notification panel." into honeycomb
...
* commit '74d39bd902c8561153647b19625b32938f38498c':
Correct the translationY of the empty notification panel.
2011-01-27 15:00:33 -08:00
Gilles Debunne
58ee6c6eaa
am 315f3865: Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb
...
* commit '315f3865983f59e5ad9f42602f443e8c42b6e5c4':
CustomSelectionActionModeCallback can prevent selection mode from starting.
2011-01-27 15:00:29 -08:00
Gilles Debunne
1f5fd5b968
am bbdd9d3f: Merge "Refresh the list of preloaded drawables and color state lists" into honeycomb
...
* commit 'bbdd9d3fbc1995adb4d327515ba0af8515436d2d':
Refresh the list of preloaded drawables and color state lists
2011-01-27 15:00:23 -08:00
Chet Haase
6d894af50c
am 246bf85a: Merge "Fix NPE with display lists when view not attached" into honeycomb
...
* commit '246bf85aaacbadf4e892270d714efcdb280a3de8':
Fix NPE with display lists when view not attached
2011-01-27 15:00:17 -08:00
Basavapatna Dattaguru
015720a245
Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb
2011-01-27 13:54:52 -08:00
Adam Powell
fbf98d1306
Merge "Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info" into honeycomb
2011-01-27 13:53:03 -08:00
Gilles Debunne
e041ccc195
Merge "Soft keyboard is not shown when text selection mode is aborted." into honeycomb
2011-01-27 13:51:48 -08:00
Huahui Wu
2b7cd684b3
Merge "b/3347670 Support installing online certs to the system keystore." into honeycomb
2011-01-27 13:26:27 -08:00
Vasu Nori
896627d7f4
Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
2011-01-27 12:46:00 -08:00
Daniel Sandler
1a1f0cb7f2
Merge "Correct the translationY of the empty notification panel." into honeycomb
2011-01-27 11:11:37 -08:00
Gilles Debunne
268011b2d0
Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb
2011-01-27 11:07:16 -08:00
Gilles Debunne
3ea2c65f6c
Merge "Refresh the list of preloaded drawables and color state lists" into honeycomb
2011-01-27 11:07:04 -08:00
Chet Haase
9452a5c5f1
Merge "Fix NPE with display lists when view not attached" into honeycomb
2011-01-27 10:41:26 -08:00
Gil Dobjanschi
f8d16a172a
am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
...
* commit 'eea200a96a561d8eb9e26831aa6aaf7ddf6ad5a5':
Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
2011-01-27 10:34:39 -08:00
Robert Greenwalt
27abf0566b
am 89a54408: Merge "Update networktype before sending state change." into gingerbread
...
* commit '89a544088fcfa849be0d8824a2ac0a545950847b':
Update networktype before sending state change.
2011-01-27 10:20:33 -08:00
Robert Greenwalt
08f897d2b3
Merge "Update networktype before sending state change." into gingerbread
2011-01-27 10:17:33 -08:00
Dirk Dougherty
c4d002d769
am d1ca9aa5: am 591a5f86: Doc change: fix adt archive filename.
...
* commit 'd1ca9aa561337dd294b8ae137f54b182372e69fb':
Doc change: fix adt archive filename.
2011-01-27 10:10:49 -08:00
Dirk Dougherty
d6684a41c0
am 591a5f86: Doc change: fix adt archive filename.
...
* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
2011-01-27 10:08:09 -08:00
Justin Ho
05eddc0a97
am bbc1d355: Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and xlarge-hdpi
...
* commit 'bbc1d355f8f9b9908bd152125a42c3d890a12d63':
Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and xlarge-hdpi
2011-01-27 07:58:01 -08:00
Chet Haase
3d162e338a
am e38ba4ac: Fix gmail crossfade artifacts.
...
* commit 'e38ba4acbe6f1536997ffb98d662fc3eff07add8':
Fix gmail crossfade artifacts.
2011-01-27 01:30:09 -08:00
Jeff Brown
4f33a6522a
am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb
...
* commit 'da910fd5ea024f214f806d880d86d77bf94497b5':
Handle ActivityNotFoundException in the WM policy.
2011-01-26 23:54:16 -08:00
Jeff Brown
8d5e5c68af
Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb
2011-01-26 23:52:41 -08:00
Chet Haase
a6a598d994
am a45c056e: Merge "Fix display List bugs" into honeycomb
...
* commit 'a45c056e62be0ca97edbdd6f6660822cf453c886':
Fix display List bugs
2011-01-26 23:51:58 -08:00
Jeff Brown
6fdb1605b7
am f02853f2: Merge "Fix down arrow in AutoCompleteTextView." into honeycomb
...
* commit 'f02853f211f0b7f698f82305e30c23e527192584':
Fix down arrow in AutoCompleteTextView.
2011-01-26 23:49:41 -08:00
Chet Haase
2bc4959ab5
Merge "Fix display List bugs" into honeycomb
2011-01-26 23:49:23 -08:00
Jeff Brown
9cb396a153
Merge "Fix down arrow in AutoCompleteTextView." into honeycomb
2011-01-26 23:45:59 -08:00
Vasu Nori
895f6e2c32
am d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
...
* commit 'd529d0df8f2e93e0dc74887ab43eff46e07cef2e':
bug:3396894 (HC branch) remove STOPSHIP code
2011-01-26 23:45:27 -08:00
Vasu Nori
e1b06e72a7
Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
2011-01-26 23:43:17 -08:00
Svetoslav Ganov
371744de71
am c291a7bf: Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb
...
* commit 'c291a7bf7a163cea10be135279103f72a6418383':
The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week.
2011-01-26 23:01:03 -08:00
Svetoslav Ganov
0f0eac818f
Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb
2011-01-26 22:59:23 -08:00
Basavapatna Dattaguru
19979c298b
am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
...
* commit '89378fd1666cd589599a0c5a7d0c71fa2f8159a5':
Revert "Video editor CTS: Framework modifications"
2011-01-26 22:52:38 -08:00
Basavapatna Dattaguru
46cbdcf03d
am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb
...
* commit '3b728ca70a4fe6760b682589505d76848c47d765':
Revert "Fixes Issue ID: 3396697"
2011-01-26 22:52:31 -08:00
Basavapatna Dattaguru
5d53a1a084
Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
2011-01-26 22:50:59 -08:00