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

24090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
cae1bfd266 am 634e9a12: am 54525412: am 3aecdb9d: merge from open-source master 2010-05-18 18:27:18 -07:00
Dianne Hackborn
9b081a809a resolved conflicts for merge of 8b625a95 to master 
Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba
 2010-05-18 18:21:07 -07:00
Jason Sams
db3be83ac6 Merge "Split ScriptC Lib into CL, GL, and basic." 2010-05-18 16:04:21 -07:00
Jason Sams
536923df75 Split ScriptC Lib into CL, GL, and basic. 
Change-Id: Iadab35f2a967a1afd7a2fd13216d0a7acf4b6a50
 2010-05-18 13:35:45 -07:00
Mike Lockwood
ddaac246c2 Merge "MTP: More prototyping work:" 2010-05-18 13:15:15 -07:00
Mike Lockwood
d0782678df MTP: More prototyping work: 
New media scanner test program
Media scanner now cleans up after files that no longer exist
Separate database table for audio files
Extract metadata from audio files with libstagefright

Change-Id: I2bd0fe877836c741658e72fcfeb89c11be0d9b41
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-18 16:12:38 -04:00
The Android Open Source Project
634e9a12f4 am 54525412: am 3aecdb9d: merge from open-source master 2010-05-18 12:50:20 -07:00
The Android Open Source Project
54525412c2 am 3aecdb9d: merge from open-source master 
Merge commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf' into kraken

* commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf':
  fix build
  Fix some typos and other cosmetic cleanups in telephony framework.
 2010-05-18 12:49:01 -07:00
The Android Open Source Project
3aecdb9d7e merge from open-source master 
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
 2010-05-18 12:47:02 -07:00
Dianne Hackborn
8b625a952e am 51a0c90b: Merge "Add new API to take over a window\'s Surface." into kraken 2010-05-18 12:22:53 -07:00
Dianne Hackborn
51a0c90b42 Merge "Add new API to take over a window's Surface." into kraken 2010-05-18 12:21:26 -07:00
Jean-Baptiste Queru
e25863c909 fix build 
Change-Id: I86ee569ec81e6c690f7697237be7d94307014142
 2010-05-18 11:54:42 -07:00
The Android Open Source Project
0c8ecec8f1 am b4ab2204: am 143c3d32: am 5ccb8b8c: merge from open-source master 2010-05-18 11:21:36 -07:00
The Android Open Source Project
b4ab220446 am 143c3d32: am 5ccb8b8c: merge from open-source master 2010-05-18 11:19:29 -07:00
The Android Open Source Project
143c3d32f4 am 5ccb8b8c: merge from open-source master 
Merge commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken

* commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
  Fix updating and deleting FDN entries with an empty alpha identifier.
  Abort FDN delete when number is empty (instead of name)
 2010-05-18 11:17:01 -07:00
The Android Open Source Project
5ccb8b8c4d merge from open-source master 
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
 2010-05-18 11:08:12 -07:00
Dianne Hackborn
dc8a7f69d7 Add new API to take over a window's Surface. 
Change-Id: Iad6245faadc95f19ea63c8e229a1c02e9188f69e
 2010-05-18 10:46:33 -07:00
Jean-Baptiste Queru
d87ed5a5c5 Merge "Fix some typos and other cosmetic cleanups in telephony framework." 2010-05-18 10:34:42 -07:00
Jake Hamby
9f36f51844 Fix updating and deleting FDN entries with an empty alpha identifier. 
- Fix AdnRecord.buildAdnString() to generate the correct record when alpha
identifier is empty. This allows the user to update an FDN entry to remove
the alpha identifier. Previously the entire entry would be deleted because
an empty record was generated here when the alpha identifier was empty,
rather than a record containing the phone number with an empty alpha tag.
Also, return null if the number or alpha tag are too long.

- Fix bug in IccProvider.delete() where efType was compared against local
FDN constant rather than IccConstants.EF_FDN. This would always return
false. Comparing with IccConstants.EF_FDN gives the intended behavior.

Change-Id: I0ea75d7e107c7318c9a48ae6e0a15845a718f4c0
 2010-05-18 10:26:21 -07:00
Jean-Baptiste Queru
27b2267c0d Merge "Abort FDN delete when number is empty (instead of name)" 2010-05-18 10:14:14 -07:00
The Android Open Source Project
f90fa1a04f am 75c1b73d: am 40090708: am 4547e528: merge from open-source master 2010-05-18 09:28:28 -07:00
The Android Open Source Project
75c1b73d53 am 40090708: am 4547e528: merge from open-source master 2010-05-18 09:26:27 -07:00
The Android Open Source Project
400907086a am 4547e528: merge from open-source master 
Merge commit '4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken

* commit '4547e5284e79192373f3a6bb6c452501171bc1d6':
  Removed Calls to deprecated APIs and unused Imports
 2010-05-18 09:21:28 -07:00
The Android Open Source Project
4547e5284e merge from open-source master 
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
 2010-05-18 09:18:37 -07:00
Jeff Hamilton
f6e9a082a2 Merge "Another try at fixing the docs build." 2010-05-18 09:14:36 -07:00
Scott Main
5ddfac4239 am 68cc7187: am 8473259d: am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo 2010-05-18 09:12:37 -07:00
Jeff Hamilton
7860b10d16 Another try at fixing the docs build. 
Change-Id: Ief60f4e71efee1d3bb4ee36e2f2a2fcaeb996284
 2010-05-18 11:11:57 -05:00
Scott Main
68cc718786 am 8473259d: am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo 2010-05-18 09:10:41 -07:00
Scott Main
8473259ddb am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo 
Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken

* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
  docs: fix markup error
 2010-05-18 09:07:39 -07:00
Scott Main
74e151c54c am 5f1d1002: Merge "docs: fix markup error" into froyo 
Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp

* commit '5f1d100298dfafbd996b6deff457e6d1de4008a0':
  docs: fix markup error
 2010-05-18 09:02:09 -07:00
Scott Main
5f1d100298 Merge "docs: fix markup error" into froyo 2010-05-18 08:59:03 -07:00
Scott Main
e3b9f8b9b2 docs: fix markup error 
Change-Id: I59a42f47483d76b6a3220b1d88e9d6bd96f83daf
 2010-05-18 08:43:11 -07:00
Jeff Hamilton
e5c50c6211 Merge "Fix a broken docs link." 2010-05-18 08:35:36 -07:00
Jeff Hamilton
e6c6d09a7e Fix a broken docs link. 
Change-Id: I2e940165726ecfce306cd143ed049045c927b6a0
 2010-05-18 10:34:47 -05:00
Steve Block
5de72739b7 Merge "Make sure Geolocation is robust to location providers being absent on the device." 2010-05-18 08:28:42 -07:00
Jeff Hamilton
e188664f8a Merge "Add the Loader and supporting classes." 2010-05-18 07:24:50 -07:00
Steve Block
3d9e066ab3 Make sure Geolocation is robust to location providers being absent on the device. 
Bug: 2692830
Change-Id: I19f88e20f00fe7ecfb77c06197213d273bd80411
 2010-05-18 15:16:55 +01:00
Jeff Hamilton
9911b7f83d Add the Loader and supporting classes. 
Loaders are designed to make it easier to manage
asynchronously loading data.

Change-Id: I948db08c721411e94fca071dc6fb4db2b83ea4d6
 2010-05-18 00:07:15 -05:00
Grace Kloba
5e02c431a3 If we can't scroll any more, stop the animation and 
resume update. Otherwise, we can't touch select until
the scroller animation is done.

Fix http://b/issue?id=2666473
 2010-05-17 20:38:21 -07:00
Grace Kloba
3c19d99042 If the new fling is much slower (less than 1/5 of 
the previous fling), don't accelerate it.

Fix http://b/issue?id=2672074
 2010-05-17 20:34:08 -07:00
Mathias Agopian
e0e9cb5434 am f98b752a: am d633215b: Merge "add a few tests to SharedBufferStackTest" into kraken 2010-05-17 20:14:19 -07:00
Mathias Agopian
f98b752a20 am d633215b: Merge "add a few tests to SharedBufferStackTest" into kraken 2010-05-17 20:12:10 -07:00
Mathias Agopian
d633215b60 Merge "add a few tests to SharedBufferStackTest" into kraken 2010-05-17 20:10:24 -07:00
Mathias Agopian
35b1a93d19 add a few tests to SharedBufferStackTest 
Change-Id: I1c46c07aa1483aee4d4ebd8745638a2c462cc1b3
 2010-05-17 20:08:22 -07:00
Mathias Agopian
d073c8a9ac am fdc1f4a7: am f75d738d: Merge "improve SharedBufferStack test" into kraken 2010-05-17 19:02:05 -07:00
Mathias Agopian
fdc1f4a745 am f75d738d: Merge "improve SharedBufferStack test" into kraken 2010-05-17 18:59:44 -07:00
Mathias Agopian
c93ae7519c am 1e381015: am 88bcc1c6: Merge "fix a bug where queueBuffer() would fail after the SharedbufferStack is resized" into kraken 2010-05-17 18:59:40 -07:00
Mathias Agopian
f75d738d8c Merge "improve SharedBufferStack test" into kraken 2010-05-17 18:57:46 -07:00
Mathias Agopian
1e38101513 am 88bcc1c6: Merge "fix a bug where queueBuffer() would fail after the SharedbufferStack is resized" into kraken 2010-05-17 18:57:01 -07:00
Mathias Agopian
662be102ee improve SharedBufferStack test 
Change-Id: I32683bfe0916918757280db89113595867acd5a7
 2010-05-17 18:56:10 -07:00