Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,616 Commits 3 Branches 0 Tags
3c5b56d46f77eb5e36ec75bb9ed3d25ab7762fe3
Commit Graph

30616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
3c5b56d46f Merge "resolved conflicts for merge of ff545380 to master" 2010-09-09 14:14:05 -07:00
Gilles Debunne
6eea4cd187 resolved conflicts for merge of ff545380 to master 
Change-Id: Ida3b6cec13b03d734bb1ba4e31554eb5226da749
 2010-09-09 14:07:56 -07:00
Robert Greenwalt
057d5e9824 Fix the build 
broken merge resolution.

Change-Id: Idf1abef1ef79ddc43b9eaba1e0e523085702e2fe
 2010-09-09 14:05:10 -07:00
Andreas Huber
1560473ec1 am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread 
Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'

* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
  Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
 2010-09-09 13:48:53 -07:00
John Wang
7e36e0c3b7 Merge "Fix SimUtilsTest after changing in bcdToString." 2010-09-09 13:39:43 -07:00
Robert Greenwalt
29c1ac170e Merge "resolved conflicts for merge of ec52c98d to master" 2010-09-09 13:37:42 -07:00
Christopher Tate
a8fe56adda Merge "Mute some spammy log messages from KeyButtonView" 2010-09-09 13:36:04 -07:00
Sang-il, Lee
b55df4471e Support MBCS characters in contacts and SMS messages that are stored in SIM cards. 
Change-Id: I0438c5748a47512fc2a0e4b89ac85e30e3f5c6de
 2010-09-09 13:23:42 -07:00
Robert Greenwalt
ca4306c976 resolved conflicts for merge of ec52c98d to master 
Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed
 2010-09-09 13:15:32 -07:00
Mike Lockwood
3e2d81cb73 Merge "MTP: Fix support for transfering folders and playlists." 2010-09-09 13:03:11 -07:00
Erik Gilling
980b38d2f5 Merge "surfaceflinger: give hwcomposer a chance to release buffers" 2010-09-09 13:01:27 -07:00
Erik Gilling
4b95ea0153 Merge "surfaceflinger: composite HWC_SKIP_LAYER layers" 2010-09-09 13:01:23 -07:00
Erik Gilling
1d3fc50ac0 Merge "surfaceflinger: unlock clients only after flip" 2010-09-09 13:01:18 -07:00
Mike Lockwood
792ec849e5 MTP: Fix support for transfering folders and playlists. 
This broke when I added support for transfering arbitrary files.

Change-Id: I6f2c052f3bd69839befcf0783d7aff5bcfd29b3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-09 15:59:56 -04:00
Adam Powell
14fdda3196 Merge "Fix bug 2988160 - Flinging broken in certain apps/widgets" 2010-09-09 12:26:16 -07:00
Christopher Tate
7a1a2f0e92 Mute some spammy log messages from KeyButtonView 
Change-Id: I6a254b6b9d611b3daaa9972a9d26a19c99e8572d
 2010-09-09 12:22:40 -07:00
Adam Powell
8ae0f3f6c7 Fix bug 2988160 - Flinging broken in certain apps/widgets 
Change-Id: I89de767cecbbc37cb2fe90a0346e8e1591dec60b
 2010-09-09 12:17:54 -07:00
Antti Hatala
11042a41c1 surfaceflinger: give hwcomposer a chance to release buffers 
Change-Id: I605fa779702022865dd58df3b36f37c2644ade36
 2010-09-09 12:06:48 -07:00
Antti Hatala
982f58bdcc surfaceflinger: composite HWC_SKIP_LAYER layers 
Change-Id: I363ede63287ae903d66d0d419343f4ecd81bcc00
 2010-09-09 12:06:31 -07:00
Antti Hatala
4c0a4a2b74 surfaceflinger: unlock clients only after flip 
Change-Id: I039291a36f05bbaa02b29325d4012114abd784b9
 2010-09-09 12:06:18 -07:00
Gilles Debunne
a78eca95ff Merge "Progress Dialog documentation example uses onPrepareDialog" 2010-09-09 11:56:11 -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
Gilles Debunne
12f9415b02 Merge "Smart word detection in text selection. Manual merge in HC of 63569." 2010-09-09 10:51:57 -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
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
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
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