drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,854 Commits 1 Branch 0 Tags
c37255d5d0
Commit Graph

30854 Commits

Author SHA1 Message Date
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
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
Gilles Debunne
44c1e4c72d Fix for text selection in horizontally scrolled TextViews. 
A left padding and scroll was not taken into account in cursor position.

Bug http://b/issue?id=2970142

Change-Id: Ie76e8d97f3dd5fe3a750aa82cd4b97c98892cb48
 2010-09-08 19:33:20 -07:00
Mathias Agopian
515d2c1e95 am 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread 
Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24'

* commit '099aa9a1b4eaf6536decbcafac43476c4908ef24':
  add a fps counter to sanangeles demo
 2010-09-08 19:04:07 -07:00
Mathias Agopian
099aa9a1b4 am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread 
Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp

* commit 'edbb8083a815e9d911f8e659fc5c293543fdf502':
  add a fps counter to sanangeles demo
 2010-09-08 19:01:37 -07:00
Mathias Agopian
edbb8083a8 Merge "add a fps counter to sanangeles demo" into gingerbread 2010-09-08 18:57:42 -07:00
Mathias Agopian
ce8f54942b add a fps counter to sanangeles demo 
Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
 2010-09-08 18:55:42 -07:00
Dirk Dougherty
54ceb6e68e am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50'

* commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:22:33 -07:00
Dirk Dougherty
eed5d17d78 am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit 'ea68cab8a33d3169de33c7112000cd3dae233afe' into gingerbread-plus-aosp

* commit 'ea68cab8a33d3169de33c7112000cd3dae233afe':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:14:04 -07:00
Romain Guy
9584a542e3 Merge "Purge Skia objects from GL caches as needed." 2010-09-08 18:06:11 -07:00
Dirk Dougherty
ea68cab8a3 am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread

* commit '3eb07ea483225974484c018d7d5affbf4815ceb2':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:05:58 -07:00
John Wang
4214c6d707 Fix SimUtilsTest after changing in bcdToString. 
After changes in IccUtils.bcdToString() to ignore high nibble 'F'

(see change ), the testBasic() need to be changed accordingly.

Change-Id: If52a66b1c80b5d16af5bd3f431284e79012be300
 2010-09-08 18:04:35 -07:00
Romain Guy
a2341a9f6a Purge Skia objects from GL caches as needed. 
Change-Id: I754c671cf790ad5ae8bf047ad328034217da4ecc
 2010-09-08 18:04:33 -07:00
James Dong
e3aa6aa770 am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread 
Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334'

* commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334':
  HW audio encoder expects timestamp via kKeyTime from each input buffer
 2010-09-08 17:57:56 -07:00
James Dong
a4fb816bd5 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.

Change-Id: Ie74cbed98469721d4280a0b87491e888948f0046
 2010-09-08 17:56:11 -07:00
James Dong
306cd58ddc am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread 
Merge commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp

* commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7':
  HW audio encoder expects timestamp via kKeyTime from each input buffer
 2010-09-08 17:54:28 -07:00
Dirk Dougherty
3eb07ea483 Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 2010-09-08 17:52:45 -07:00
James Dong
d353c840ad Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread 2010-09-08 17:51:59 -07:00
Mike LeBeau
1383158687 am 573c5d5e: am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread 
Merge commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9'

* commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9':
  Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
 2010-09-08 17:49:34 -07:00
Mike LeBeau
573c5d5edc am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread 
Merge commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb' into gingerbread-plus-aosp

* commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb':
  Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
 2010-09-08 17:46:22 -07:00
Chet Haase
b149f57d5e Merge "Fix bug with LayoutTransition when layouts are just coming on line" 2010-09-08 17:44:39 -07:00
Adam Cohen
3bdc7209b1 Merge "AdapterViewAnimator now properly handles notifyDataSetChanged" 2010-09-08 17:43:17 -07:00
Mike LeBeau
46b84d5b4a Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google's new "listen to" Voice Action." into gingerbread 2010-09-08 17:43:15 -07:00
Mike LeBeau
2fe6fd0558 Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended 
search and play of music. This is used, for instance, by Google's
new "listen to" Voice Action.

Change-Id: Ibbc81701cc2412ffd57402d34f22d9764e9df7c2
 2010-09-08 20:39:05 -04:00
James Dong
d015ccf62b HW audio encoder expects timestamp via kKeyTime from each input buffer 
- This fixes media server crashes on droid

Change-Id: I7191cadc5275107425ec3ee3d437b2c5295858dc
 2010-09-08 17:28:57 -07:00
Eric Laurent
15ff01cdb4 am e126119c: am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread 
Merge commit 'e126119c3a406bc564f2549aeb1416aff112689d'

* commit 'e126119c3a406bc564f2549aeb1416aff112689d':
  Modify type of some environmental reverb parameters
 2010-09-08 17:22:54 -07:00
Eric Laurent
e126119c3a am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread 
Merge commit '95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp

* commit '95d8648054223a501fe5390edef7e5d9383a4be8':
  Modify type of some environmental reverb parameters
 2010-09-08 17:19:43 -07:00