Commit Graph

28172 Commits

Author SHA1 Message Date
Dan Morrill
38fa02c58e am ed11f117: As of honeycomb, all touchscreen devices should also report faketouch.
* commit 'ed11f117ffdac3262253487ab6116211bd2c5bbd':
  As of honeycomb, all touchscreen devices should also report faketouch.
2011-01-27 17:03:55 -08:00
Jeff Brown
1611f9d161 am 41395459: (-s ours) Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
* commit '41395459e676cf9ab4059e08446656f145662c2d':
  Filter virtual keys after touches.  (DO NOT MERGE)
2011-01-27 17:03:51 -08:00
Martijn Coenen
d96ff867a1 am 07e6f616: Check NDEF before calling makeReadOnly().
* commit '07e6f616d122496342a5bae51323bb218d88f7f2':
  Check NDEF before calling makeReadOnly().
2011-01-27 17:03:19 -08:00
Nick Pelly
356b64a925 resolved conflicts for merge of a701cf85 to honeycomb-merge
Change-Id: I81a63599649a61fc73bf1e7ebcfed4c333903070
2011-01-27 16:59:02 -08:00
Nick Pelly
888c243210 am d350dc04: Merge "API: Make close() throw an IOException." into gingerbread
* commit 'd350dc0492fab3614749955f5dcf21ec1c522b24':
  API: Make close() throw an IOException.
2011-01-27 16:26:28 -08:00
Nick Pelly
d4e1ed1fff Merge "API: Make close() throw an IOException." into gingerbread 2011-01-27 16:23:35 -08:00
Santosh Madhava
adfdf7a451 am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb
* commit '270cbcc16a72f982d84afeb5e3fd3f166936394a':
  Fix for issue 3370007 Overlay transparency in Java
2011-01-27 16:02:59 -08:00
Santosh Madhava
5ccd74976a Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb 2011-01-27 16:00:15 -08:00
Adam Powell
cf2d45e0fc am d1f94e36: Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb
* commit 'd1f94e36da6276acc00d0a3267a505fd6a61702d':
  Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag
2011-01-27 15:59:46 -08:00
Adam Powell
9bb510cd5a Merge "Fix bug 3399725 - externally reported issue 14317: android:scrollbarSize attribute does not work in ScrollView tag" into honeycomb 2011-01-27 15:58:18 -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
Eric Fischer
77ab08c7e7 am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
  Import revised translations.  DO NOT MERGE
2011-01-27 15:00:43 -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
Eric Fischer
77c85a0ead Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-27 14:56:29 -08:00
Nick Pelly
1a9e2f471b am 21d0a173: Fix build - javadoc.
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
2011-01-27 14:12:49 -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
Scott Main
d84583f0a6 am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
2011-01-27 13:29:13 -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
Nick Pelly
6c2eb91e37 am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread
* commit 'eab0e97bf0951057a0624cdde2f4bc5434ade0ac':
  Clean up MifareUltralight API.
2011-01-27 13:25:52 -08:00
Scott Main
e000729397 Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread 2011-01-27 13:25:10 -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
Nick Pelly
07a30ef34b Merge "Clean up MifareUltralight API." into gingerbread 2011-01-27 12:23:53 -08:00
Mathias Agopian
830423f797 am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
* commit '72abf01a8b6958ac1f86d36302a8462c4f51fd9d':
  Fix the ISurfaceComposer onTransact switch.
2011-01-27 11:24:33 -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
Jeff Hamilton
5ac971625c resolved conflicts for merge of 0716ea14 to honeycomb-merge
Change-Id: I8f5e40c83a470e81910cd07f11fe683bb6f96421
2011-01-27 12:29:27 -06: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