26051 Commits

Author SHA1 Message Date
Dirk Dougherty
976b71e2e0 am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp

* commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:52:41 -07:00
Dirk Dougherty
afdc85f65d am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '397c0f5a18281e3880b9359feab683a13d271a03' into gingerbread

* commit '397c0f5a18281e3880b9359feab683a13d271a03':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:49:49 -07:00
Dirk Dougherty
397c0f5a18 Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 2010-08-23 17:40:46 -07:00
Dirk Dougherty
1ba62882e4 Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Change-Id: I9e04c54ed3e4d10afddedd6e6e35761e67652cd8
2010-08-23 17:38:35 -07:00
Dianne Hackborn
b9fb1705e8 More watermark work.
Change-Id: I1d20bc1f8679a9750b247126436e8ef7e47a77be
2010-08-23 16:51:56 -07:00
Gilles Debunne
b037da401a am 3e05a0be: Hysteresis effect in Text selection.
Merge commit '3e05a0beb2fad0b21558019d2adf6805da70e10e' into gingerbread-plus-aosp

* commit '3e05a0beb2fad0b21558019d2adf6805da70e10e':
  Hysteresis effect in Text selection.
2010-08-23 15:26:51 -07:00
Gilles Debunne
3e05a0beb2 Hysteresis effect in Text selection.
Vertical movement requires going over a given threshold to change line.
Makes it easier to move down without changing line, so that one can see the
cursor better. Also simplifies long line selection.

Change-Id: I791da500232c6e510af64c637ed994c5da9a4fea
2010-08-23 15:20:53 -07:00
Daisuke Miyakawa
0263b0d887 Make VCardTestsBase public.
Change-Id: I9f1adc6f0b4263424897609b3cc0855e83906407
2010-08-23 14:51:20 -07:00
Jean-Baptiste Queru
026231284c resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp
Change-Id: I2741766c359bed3040fa3b787d72483eb028fb6d
2010-08-23 14:20:47 -07:00
Jean-Baptiste Queru
360ab1dfb4 am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."
Merge commit '6864b3e2f4e67be847b2ae054f2f9c388f115722' into gingerbread-plus-aosp

* commit '6864b3e2f4e67be847b2ae054f2f9c388f115722':
  Adds the ability to Android to initiate a 2 Digit Call.
2010-08-23 14:14:45 -07:00
Mathias Agopian
394c9bf659 am 0c76c7c5: Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread
Merge commit '0c76c7c5eedf90b5fa1a95b6a9944b4e58747007' into gingerbread-plus-aosp

* commit '0c76c7c5eedf90b5fa1a95b6a9944b4e58747007':
  add new sensor types for handling gyro data and device orientation
2010-08-23 13:56:22 -07:00
Mathias Agopian
0c76c7c5ee Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread 2010-08-23 13:54:17 -07:00
Robert Greenwalt
b998f3111d Merge "Add an API to request route to an IPv6 host." 2010-08-23 13:54:04 -07:00
Jean-Baptiste Queru
1ffd753ee0 Merge "Crash when powering off." 2010-08-23 13:24:19 -07:00
Jean-Baptiste Queru
6864b3e2f4 Merge "Adds the ability to Android to initiate a 2 Digit Call." 2010-08-23 13:22:00 -07:00
Sean McNeil
9b7b5c275e am 40a87586: Only monitor recognized uevent devices.
Merge commit '40a87586761450f80ad44f948a35266e87f326de' into gingerbread-plus-aosp

* commit '40a87586761450f80ad44f948a35266e87f326de':
  Only monitor recognized uevent devices.
2010-08-23 13:07:59 -07:00
Sean McNeil
40a8758676 Only monitor recognized uevent devices.
system_server can potentially monitor uevent devices that are
of no use to it. For instance, an accelerometer implementation
as uevents. This would cause the process to be busy when
unnecessary. If a device cannot be classified, don't monitor it.

Change-Id: I489cc453bdce7cb376102cba67a9ea470e13292d
2010-08-23 12:54:30 -07:00
Scott Main
32b07fc6ca am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp

* commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9':
  docs: add dev guide for getting user location
2010-08-23 12:44:18 -07:00
Scott Main
e7aa645a1a am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit '5a98fef352ed835406fa74a5563eadd9708f7cf9' into gingerbread

* commit '5a98fef352ed835406fa74a5563eadd9708f7cf9':
  docs: add dev guide for getting user location
2010-08-23 12:41:45 -07:00
Scott Main
5a98fef352 Merge "docs: add dev guide for getting user location" into froyo 2010-08-23 12:32:51 -07:00
Andreas Huber
31e7113104 am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread
Merge commit '3e22ef1e111966df6ad527632fdc35d105c73916' into gingerbread-plus-aosp

* commit '3e22ef1e111966df6ad527632fdc35d105c73916':
  Better handling of rtsp connection and disconnection.
2010-08-23 12:28:26 -07:00
Andreas Huber
3e22ef1e11 Merge "Better handling of rtsp connection and disconnection." into gingerbread 2010-08-23 12:26:31 -07:00
Andreas Huber
8370be11de Better handling of rtsp connection and disconnection.
Change-Id: Ib126af6c14c5a212a51a5ee3c4a0a7d1860ad167
2010-08-23 11:28:34 -07:00
James Dong
28a92120a7 am 3f51fa78: Runtime dump support for MediaWriter
Merge commit '3f51fa78ada0e064d23db5961337280c267cc2c0' into gingerbread-plus-aosp

* commit '3f51fa78ada0e064d23db5961337280c267cc2c0':
  Runtime dump support for MediaWriter
2010-08-23 10:50:29 -07:00
James Dong
3f51fa78ad Runtime dump support for MediaWriter
Change-Id: I10b2c474de612ee4cef4b7c9eae2ee1dd8c2e895
2010-08-23 10:34:05 -07:00
Chia-chi Yeh
a102871c7c am b80e610b: Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
Merge commit 'b80e610b070c2cec98a228a8aec450dc24a5f90a' into gingerbread-plus-aosp

* commit 'b80e610b070c2cec98a228a8aec450dc24a5f90a':
  Visualizer: replace the FFT implementation with a faster one.
2010-08-22 18:38:29 -07:00
Chia-chi Yeh
b80e610b07 Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread 2010-08-22 18:31:15 -07:00
Chih-Chung Chang
d51a933b94 am 72ecb00a: Merge "Revert "Don\'t recycle native bitmap after the finalizer is called."" into gingerbread
Merge commit '72ecb00a89b7a49eadb9c3bb880102eef97c8eb6' into gingerbread-plus-aosp

* commit '72ecb00a89b7a49eadb9c3bb880102eef97c8eb6':
  Revert "Don't recycle native bitmap after the finalizer is called."
2010-08-22 04:31:38 -07:00
Chih-Chung Chang
72ecb00a89 Merge "Revert "Don't recycle native bitmap after the finalizer is called."" into gingerbread 2010-08-22 04:23:51 -07:00
Irfan Sheriff
b65444df01 am 80db4381: Merge "DO NOT MERGE Enable all networks on screen on" into gingerbread
Merge commit '80db4381c010c4dec74c2bf1e02380759e4ff97b' into gingerbread-plus-aosp

* commit '80db4381c010c4dec74c2bf1e02380759e4ff97b':
  DO NOT MERGE Enable all networks on screen on
2010-08-21 11:53:08 -07:00
Irfan Sheriff
80db4381c0 Merge "DO NOT MERGE Enable all networks on screen on" into gingerbread 2010-08-21 11:45:47 -07:00
Chih-Chung Chang
601ede9aa3 Revert "Don't recycle native bitmap after the finalizer is called."
Bitmap should not be accessed from multiple threads.

This reverts commit 966803ab81f8e9bfefa502fcb533de023825a389.
2010-08-22 00:23:18 +08:00
Kevin Powell
7a0541d6b8 add new sensor types for handling gyro data and device orientation
more efficiently.

Change-Id: Ifbcf2caae0865eccf1c9b8060342185c22145a30
2010-08-20 19:24:02 -07:00
Steve Howard
6d895fdbc0 am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
Merge commit 'd2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf' into gingerbread-plus-aosp

* commit 'd2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf':
  Make ProgressBar.setVisibility() remotable.
2010-08-20 19:06:23 -07:00
Steve Howard
d2e5f95e0e Merge "Make ProgressBar.setVisibility() remotable." into gingerbread 2010-08-20 19:04:35 -07:00
Trevor Johns
63f05fe487 am bb75aa90: am ca9d51b1: Disabling AccessibilityService sample from build system.
Merge commit 'bb75aa9065b1234bee8b27681810d563e31d955b' into gingerbread-plus-aosp

* commit 'bb75aa9065b1234bee8b27681810d563e31d955b':
  Disabling AccessibilityService sample from build system.
2010-08-20 18:45:26 -07:00
Trevor Johns
bb75aa9065 am ca9d51b1: Disabling AccessibilityService sample from build system.
Merge commit 'ca9d51b15074163521b140dce431cc3a10cb56fe' into gingerbread

* commit 'ca9d51b15074163521b140dce431cc3a10cb56fe':
  Disabling AccessibilityService sample from build system.
2010-08-20 18:42:38 -07:00
Jean-Baptiste Queru
c64b916ef5 resolved conflicts for merge of e7731f0a to gingerbread-plus-aosp
Change-Id: I8001a95f8c44ef0343e0a50de4bd5b5a85d41c38
2010-08-20 18:19:03 -07:00
Christian Mehlmauer
e7731f0a7f Added overload methods for DatabaseUtils.queryNumEntries
Now you can filter the count statement with a selection
and selection args
UnitTests for this new methods are added to the cts project

Change-Id: Id9233aec0eaac08839041ae7cbaba203470ad3d8
2010-08-20 18:02:09 -07:00
Jean-Baptiste Queru
f235a51939 am ec58dff0: Fix build - remove dead doc link
Merge commit 'ec58dff06693342f12f295fdb7b41cfcbaeb4f14' into gingerbread-plus-aosp

* commit 'ec58dff06693342f12f295fdb7b41cfcbaeb4f14':
  Fix build - remove dead doc link
2010-08-20 17:54:33 -07:00
Jean-Baptiste Queru
ec58dff066 Fix build - remove dead doc link
Change-Id: I72e05d41819c14bf67d721740e0d48c71eeae397
2010-08-20 17:44:14 -07:00
Steve Howard
b25ffffc31 Make ProgressBar.setVisibility() remotable.
ProgressBar overrides setVisibilty(), causing it to lose the
RemotableViewMethod annotation and making it impossible to hide a
ProgressBar in a RemoteViews.  This change adds the annotation.

Change-Id: Ic1212b99fd52f8c36bef4805bfef5e170b28f0a6
2010-08-20 17:39:26 -07:00
Jean-Baptiste Queru
0460e26a4c resolved conflicts for merge of 691be97f to gingerbread-plus-aosp
Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124
2010-08-20 17:16:37 -07:00
Trevor Johns
ca9d51b150 Disabling AccessibilityService sample from build system.
This is necessary for an upcoming doc push. I'll revert this change after the
doc push is complete.

Change-Id: I32bbff7797cf5af1642da2b907b20847c1d17d21
2010-08-20 17:13:02 -07:00
Wink Saville
d903487968 am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e' into gingerbread-plus-aosp

* commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
2010-08-20 16:37:21 -07:00
Wink Saville
b2cc86da29 am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b' into gingerbread

* commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
2010-08-20 16:34:16 -07:00
Wink Saville
3158cf689f Change CDMAPhone.getDeviceId to return MEID or ESN.
This allows devices with only ESN's to work.

bug: 2938223
Change-Id: I33939151c59f598b939e73d98f1178669d6ceb75
2010-08-20 16:24:02 -07:00
Jean-Baptiste Queru
691be97f16 Merge "add new sensor types for handling gyro data and device orientation more efficiently." 2010-08-20 16:21:11 -07:00
Jean-Baptiste Queru
b13c9bc521 manual merge
Change-Id: Ib92a75958b857277e17f4bd0bee75744c653c942
2010-08-20 15:58:49 -07:00
Romain Guy
5a14271aac am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread
Merge commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d' into gingerbread-plus-aosp

* commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d':
  Load bitmaps in the correct format.
2010-08-20 15:45:09 -07:00