30979 Commits

Author SHA1 Message Date
Gilles Debunne
ca1b261509 am 87e215fd: Merge "Made context menu appear when tapping inside selection." into gingerbread
Merge commit '87e215fd54559935649fb07264ece600bbabbdf9' into gingerbread-plus-aosp

* commit '87e215fd54559935649fb07264ece600bbabbdf9':
  Made context menu appear when tapping inside selection.
2010-09-09 12:00:52 -07:00
Mathias Agopian
45bd99466c am fec5d38b: Merge "option to enable multisampling" into gingerbread
Merge commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp

* commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2':
  option to enable multisampling
2010-09-09 11:58:14 -07:00
Gilles Debunne
87e215fd54 Merge "Made context menu appear when tapping inside selection." into gingerbread 2010-09-09 11:56:28 -07:00
Gilles Debunne
a78eca95ff Merge "Progress Dialog documentation example uses onPrepareDialog" 2010-09-09 11:56:11 -07:00
Mathias Agopian
fec5d38baf Merge "option to enable multisampling" into gingerbread 2010-09-09 11:55:00 -07:00
Mathias Agopian
850753b6f4 option to enable multisampling
multisampling can be enabled by specifying the number of
samples desired on the command line.

Change-Id: I5f93c93ae7ada54bcd646c1065e07890d0cb9808
2010-09-09 11:53:17 -07:00
Romain Guy
a5682df238 Merge "Do not convert 8888 bitmaps to 565 when doing a copy." 2010-09-09 11:52:02 -07:00
Romain Guy
d90f23e24a Do not convert 8888 bitmaps to 565 when doing a copy.
Bug #2988077
This change keeps the 8888 format for new bitmaps and also keeps,
when possible, the opaque flag.

Change-Id: Ia61f2e89936916b329212a4c59a7d815c329f84e
2010-09-09 11:47:54 -07:00
Steve Howard
1ed20dc43b am e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread
Merge commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp

* commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04':
  Hidden API to control sorting of download manager queries.
2010-09-09 11:26:08 -07:00
Mathias Agopian
a9ff29b59c am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbread
Merge commit '6808e6a867ba0b32f8bd97163e134c2866423f01' into gingerbread-plus-aosp

* commit '6808e6a867ba0b32f8bd97163e134c2866423f01':
  Fix a few typos in EGL wrapper
2010-09-09 11:23:16 -07:00
Steve Howard
e3692d153e Merge "Hidden API to control sorting of download manager queries." into gingerbread 2010-09-09 11:22:38 -07:00
Mathias Agopian
6808e6a867 Merge "Fix a few typos in EGL wrapper" into gingerbread 2010-09-09 11:20:02 -07:00
Steve Howard
f054e190bb Hidden API to control sorting of download manager queries.
This change adds a hidden API to sort download manager queries by size
rather than by time last modified.  This is necessary for the system
download manager UI but, in the interest of keeping the new public API
as minimal as possible for now, I'm leaving @hide on this method.

This change also changes the DownloadManager.COLUMN_ID column to be
identical to BaseColumns._ID, since some code relies on this (such as
CursorAdapter).

Change-Id: Ib89b614d63e988974d4486b122b39365b35b5269
2010-09-09 11:14:20 -07:00
Mathias Agopian
97961db7d3 Fix a few typos in EGL wrapper
Change-Id: I3b815ca6ec334ca12088f9721eece33df42b2e46
2010-09-09 11:12:54 -07:00
Gilles Debunne
b189249735 Made context menu appear when tapping inside selection.
Change-Id: I7ca274b007f4daea7d37a3d6b10b9504874b3c49
2010-09-09 10:53:16 -07:00
Gilles Debunne
12f9415b02 Merge "Smart word detection in text selection. Manual merge in HC of 63569." 2010-09-09 10:51:57 -07:00
Jaikumar Ganesh
049912b76f am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread
Merge commit '9395b4656aca4b00d080ada89a44631459ad7b85' into gingerbread-plus-aosp

* commit '9395b4656aca4b00d080ada89a44631459ad7b85':
  Fix to get A2DP to connect after unpairing
2010-09-09 10:26:54 -07:00
Jaikumar Ganesh
9395b4656a Merge "Fix to get A2DP to connect after unpairing" into gingerbread 2010-09-09 10:23:55 -07:00
Henrik Backlund
4226415bd9 Fix to get A2DP to connect after unpairing
In this fix, A2DP profile will be connected when pairing with a
previously paired headset. The reason for this error was that the
connection of the A2DP profile was sent before the callback
onCreatePairedDeviceResult was receied in BluetoothEventLoop.java.
By not going to the state BOND_BONDED until after this callback has been
received, the problem is fixed. However the use case is different if the
pairing is initiated by the remote device. In these cases state
BOND_BONDED will be set when onDevicePropertyChanged instead.

Change-Id: I5dedca87d0a6872705ff3a933a99cce6eb37618a
2010-09-09 10:19:55 -07:00
Andreas Huber
8986f62b30 am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread
Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp

* commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e':
  Instead of asserting return a runtime error if the maximum sample size cannot be determined.
2010-09-09 10:15:33 -07:00
James Dong
e19df3dca1 am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
Merge commit '5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp

* commit '5c43a7af7b9530016b922ddec0401ab9199cd595':
  When 32-bit offset is used,
2010-09-09 10:15:29 -07:00
Romain Guy
c804b27d11 Merge "A Path can exist in several cache entries." 2010-09-09 10:14:33 -07:00
Romain Guy
183f17e7eb A Path can exist in several cache entries.
Change-Id: I742f7425d2b6bef753ed3e04fb39ebb103b2dc00
2010-09-09 10:13:31 -07:00
Andreas Huber
f3de053c0a Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread 2010-09-09 10:13:26 -07:00
James Dong
5c43a7af7b Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread 2010-09-09 10:13:08 -07:00
Andreas Huber
d7f2225e74 Instead of asserting return a runtime error if the maximum sample size cannot be determined.
Change-Id: Icf17ed04323f5415e0f9f1e4fd9f19ca60ce15ac
related-to-bug: 2602446
2010-09-09 10:10:15 -07:00
Gilles Debunne
ff54538096 am ab86b782: Merge "Fix for text selection in horizontally scrolled TextViews." into gingerbread
Merge commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80' into gingerbread-plus-aosp

* commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80':
  Fix for text selection in horizontally scrolled TextViews.
2010-09-09 10:04:32 -07:00
Gilles Debunne
03789e8d59 Smart word detection in text selection. Manual merge in HC of 63569.
Selecting between words selects the spaces instead of the closest word, facilitating
paste insertion vs word replacement.

Pasting adds/removes space before and after if needed so that pasted text is not appended to
existing text.

Change-Id: Iffa0fb573d3535af72b639d05c5dc0721e80bda5
2010-09-09 10:03:42 -07:00
Gilles Debunne
ab86b782fd Merge "Fix for text selection in horizontally scrolled TextViews." into gingerbread 2010-09-09 10:02:05 -07:00
Andreas Huber
f0eab98c4e am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread
Merge commit 'a063cd6478254bba3290576ae5556abf469d6535' into gingerbread-plus-aosp

* commit 'a063cd6478254bba3290576ae5556abf469d6535':
  Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
2010-09-09 10:01:05 -07:00
Andreas Huber
a063cd6478 Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread 2010-09-09 09:59:03 -07:00
Robert Greenwalt
ec52c98d44 am 0727a865: Merge "Add network condition reporting." into gingerbread
Merge commit '0727a865d83b944c2fecc0bf1228a36976fe5300' into gingerbread-plus-aosp

* commit '0727a865d83b944c2fecc0bf1228a36976fe5300':
  Add network condition reporting.
2010-09-09 09:49:15 -07:00
Andreas Huber
3e0f2be7d6 Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
Change-Id: I26db4524c5306bf2346438d2bd359c5cfb95cead
related-to-bug: 2900419
2010-09-09 09:48:41 -07:00
Robert Greenwalt
0727a865d8 Merge "Add network condition reporting." into gingerbread 2010-09-09 09:41:05 -07:00
Robert Greenwalt
d7085fcf65 Add network condition reporting.
Apps can report if they like their connection to the nets
and we display either not-really-connected or fully-connected
icons.  Final icons TBD.

bug:2978624
Change-Id: I28be52085edfe54571c0d4559aba0df883548654
2010-09-09 09:33:02 -07:00
Gilles Debunne
6e1df0e981 Progress Dialog documentation example uses onPrepareDialog
Change-Id: I7afebdb321e28d8e4b1687ba4f503bde7d6031a0
2010-09-09 09:21:53 -07:00
Mike Lockwood
8624e6399d Merge "Add framework resource to specify case sensitivity of the external storage filesystem" 2010-09-09 08:28:53 -07:00
Mike Lockwood
f73738b78a Add framework resource to specify case sensitivity of the external storage filesystem
Change-Id: I8a433de9188c32214b1f8d6a4490dfe731d68c40
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-09 09:58:24 -04:00
Mike Lockwood
2117f6fa38 Only pulse notification light if a new notification has been received since the screen was last turned off
BUG: 2980248

Change-Id: I4dca527a191fae4ad87eeff8ad32594fd6aeb417
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-09 09:48:08 -04:00
Chia-chi Yeh
3384e0f69b am c2eff4a7: am f6936a3a: Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread
Merge commit 'c2eff4a71bd3ab75983ffd029123f10bc177d32a'

* commit 'c2eff4a71bd3ab75983ffd029123f10bc177d32a':
  RTP: prevent buffer overflow in AudioRecord.
2010-09-09 02:44:04 -07:00
Chia-chi Yeh
c2eff4a71b am f6936a3a: Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread
Merge commit 'f6936a3a52b6bb6de27f75d4e38d116e896b7f4d' into gingerbread-plus-aosp

* commit 'f6936a3a52b6bb6de27f75d4e38d116e896b7f4d':
  RTP: prevent buffer overflow in AudioRecord.
2010-09-09 02:39:58 -07:00
Chia-chi Yeh
f6936a3a52 Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread 2010-09-09 02:37:07 -07:00
Henrik Backlund
a79c82918e Fix to get A2DP to connect after unpairing
In this fix, A2DP profile will be connected when pairing with a
previously paired headset. The reason for this error was that the
connection of the A2DP profile was sent before the callback
onCreatePairedDeviceResult was receied in BluetoothEventLoop.java.
By not going to the state BOND_BONDED until after this callback has been
received, the problem is fixed. However the use case is different if the
pairing is initiated by the remote device. In these cases state
BOND_BONDED will be set when onDevicePropertyChanged instead.

Change-Id: I5dedca87d0a6872705ff3a933a99cce6eb37618a
2010-09-09 10:07:15 +02:00
Adam Powell
048a3a5b18 Allow two finger pan and scale on touchscreens with
FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT.

Change-Id: Ia5a1655d3bd9bf13cc8d84a1f7ee2bc9dca8ac49
2010-09-09 00:21:05 -07:00
Chung-yih Wang
98093a9418 am b2118252: am 4d1e0121: Change the keep-alive interval to 10 seconds.
Merge commit 'b2118252545f4b3ab43ffb2cda4b956f8f85ff69'

* commit 'b2118252545f4b3ab43ffb2cda4b956f8f85ff69':
  Change the keep-alive interval to 10 seconds.
2010-09-08 22:47:30 -07:00
Chung-yih Wang
b211825254 am 4d1e0121: Change the keep-alive interval to 10 seconds.
Merge commit '4d1e0121277b566b5e1c22e790a3b607b75d945d' into gingerbread-plus-aosp

* commit '4d1e0121277b566b5e1c22e790a3b607b75d945d':
  Change the keep-alive interval to 10 seconds.
2010-09-08 22:42:52 -07:00
Chung-yih Wang
4d1e012127 Change the keep-alive interval to 10 seconds.
Change-Id: I216cee622f57ee18533de3960d4da1a41e01f1ae
2010-09-09 13:27:10 +08:00
Adam Powell
079fd1c0a3 Make action buttons more style-based
Change-Id: Ia7ef4da8d8004f1b3809b4883aafc541695d235a
2010-09-08 21:40:54 -07:00
Neal Nguyen
1e3187c27f am 0c592acf: Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp
Merge commit '0c592acfc0ea298a0cf6c049cce4c5c10974e911'

* commit '0c592acfc0ea298a0cf6c049cce4c5c10974e911':
  Adding Download Manager Integration, stress, and hosts-based tests.
2010-09-08 20:26:50 -07:00
Neal Nguyen
0c592acfc0 Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp 2010-09-08 20:23:43 -07:00