ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
18,050 Commits 2 Branches 0 Tags 54 MiB
698cdb5c5d
Commit Graph

18050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
698cdb5c5d Merge "Support bidi/shaping for getTextPath" 2010-07-13 13:51:24 -07:00
James Dong
f73e86207d am 7a72f848: am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__ 
Merge commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911'

* commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911':
  Fix simulator build
 2010-07-13 13:46:07 -07:00
James Dong
8b7afb784a am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__ 
Merge commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4' into gingerbread-plus-aosp

* commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4':
  Fix simulator build
 2010-07-13 13:43:39 -07:00
Konstantin Lopyrev
22c883d693 am 29227aaf: am c1ca7f8c: Merge "Making sure that the list of windows updates automatically in hierarchy viewer (View Server side)" into gingerbread 
Merge commit '29227aafa06092a28995ac9611012f2060b6b34f'

* commit '29227aafa06092a28995ac9611012f2060b6b34f':
  Making sure that the list of windows updates automatically in hierarchy viewer (View Server side)
 2010-07-13 13:16:47 -07:00
Konstantin Lopyrev
81553e4c07 am c1ca7f8c: Merge "Making sure that the list of windows updates automatically in hierarchy viewer (View Server side)" into gingerbread 
Merge commit 'c1ca7f8c537195b830695ca988945c9d1df0e0e4' into gingerbread-plus-aosp

* commit 'c1ca7f8c537195b830695ca988945c9d1df0e0e4':
  Making sure that the list of windows updates automatically in hierarchy viewer (View Server side)
 2010-07-13 13:13:17 -07:00
Konstantin Lopyrev
a65139634e Merge "Making sure that the list of windows updates automatically in hierarchy viewer (View Server side)" into gingerbread 2010-07-13 13:10:48 -07:00
Steve Howard
17562a79e6 am 47b46648: am b8d890eb: Merge "Initial implementation of the download manager public API." into gingerbread 
Merge commit '47b46648b5a9b8c518b96db37618fc49c5e5f2d1'

* commit '47b46648b5a9b8c518b96db37618fc49c5e5f2d1':
  Initial implementation of the download manager public API.
 2010-07-13 13:05:43 -07:00
Steve Howard
bd4ddfbcaf am b8d890eb: Merge "Initial implementation of the download manager public API." into gingerbread 
Merge commit 'b8d890ebc1923d98d19d24f396442c91eb766b16' into gingerbread-plus-aosp

* commit 'b8d890ebc1923d98d19d24f396442c91eb766b16':
  Initial implementation of the download manager public API.
 2010-07-13 13:03:20 -07:00
Steve Howard
d90f789633 Merge "Initial implementation of the download manager public API." into gingerbread 2010-07-13 13:01:41 -07:00
Alex Sakhartchouk
01efcf9c29 Merge "Work on synchronizing a3d created files and java layer. Adding culling to ProgramRaster" 2010-07-13 12:46:36 -07:00
The Android Open Source Project
dccaa838d9 am 10dde211: merge from open-source master 
Merge commit '10dde211457417aa1392cc3a5457728c84ed0d2f'

* commit '10dde211457417aa1392cc3a5457728c84ed0d2f':
  Remove top panel in alert dialog if empty.
 2010-07-13 12:35:57 -07:00
Eric Laurent
a0296eda48 am 66fa2b44: am 8e886be4: Merge "Modifications in audio effect engine state management." into gingerbread 
Merge commit '66fa2b44cadf8694cc1b7e2aae1f8abaff4fc547'

* commit '66fa2b44cadf8694cc1b7e2aae1f8abaff4fc547':
  Modifications in audio effect engine state management.
 2010-07-13 12:33:47 -07:00
The Android Open Source Project
a689e78f87 merge from open-source master 
Change-Id: Id2ad46118e0ca957b65b911c52d7bbcf2a4649a2
 2010-07-13 12:33:22 -07:00
Eric Laurent
f5bdb97164 am 8e886be4: Merge "Modifications in audio effect engine state management." into gingerbread 
Merge commit '8e886be413570fab6c623930a5775dd36a6d11e1' into gingerbread-plus-aosp

* commit '8e886be413570fab6c623930a5775dd36a6d11e1':
  Modifications in audio effect engine state management.
 2010-07-13 12:31:35 -07:00
Eric Laurent
cbf35c041c Merge "Modifications in audio effect engine state management." into gingerbread 2010-07-13 12:29:17 -07:00
Eric Laurent
70d8f430a6 Modifications in audio effect engine state management. 
- Separate the updating of effect engine state from the process call in EffectModule so that the state
of all effects in the same effect chain is updated simultaneusly before all process functions are called.
- Added a mechanism for the effect engine to continue being called for processing after receiving the disable
commands untils it considers that the framework can stop calling the process function without causing
a glitch or loosing some effect tail.
- Updated test reverb and equalizer to support this new feature

Change-Id: Icb56ae2c84c076d4dbad6cf733b1a62f823febe7
 2010-07-13 12:27:18 -07:00
Andy McFadden
50c3b9bf67 Merge "Allow "am" to initiate heap dumps." 2010-07-13 12:19:52 -07:00
Romain Guy
8fb51d12e5 Merge "Cleanup: remove unnecessary parameters." 2010-07-13 11:37:58 -07:00
James Dong
f41d170687 am f6bdc764: am 9d8bea11: Merge "Initial checkin for software AVC encoder" into gingerbread 
Merge commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea'

* commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea':
  Initial checkin for software AVC encoder
 2010-07-13 11:04:27 -07:00
James Dong
659b0a97fb am 9d8bea11: Merge "Initial checkin for software AVC encoder" into gingerbread 
Merge commit '9d8bea11892a43eeab2a1119d68740845a8894e5' into gingerbread-plus-aosp

* commit '9d8bea11892a43eeab2a1119d68740845a8894e5':
  Initial checkin for software AVC encoder
 2010-07-13 11:01:37 -07:00
James Dong
fe03065ace Merge "Initial checkin for software AVC encoder" into gingerbread 2010-07-13 10:59:34 -07:00
Joe Malin
e494d9eb49 am 95ccd875: (-s ours) am d93f4e5b: Merge "DO NOT MERGE Doc Change: Javadoc for test case classes" into gingerbread 
Merge commit '95ccd875824e640d0958c2fb6715a8edb783d41a'

* commit '95ccd875824e640d0958c2fb6715a8edb783d41a':
  DO NOT MERGE Doc Change: Javadoc for test case classes
 2010-07-13 09:59:10 -07:00
Joe Malin
1761c59a10 am d93f4e5b: Merge "DO NOT MERGE Doc Change: Javadoc for test case classes" into gingerbread 
Merge commit 'd93f4e5b70f37feae0cbdf1f456c167a1ea37433' into gingerbread-plus-aosp

* commit 'd93f4e5b70f37feae0cbdf1f456c167a1ea37433':
  DO NOT MERGE Doc Change: Javadoc for test case classes
 2010-07-13 09:53:27 -07:00
Robert Greenwalt
2529b10571 Merge "Revert to an uncompressed MccTable." 2010-07-13 09:48:36 -07:00
Gilles Debunne
7e640d4efb Merge "Selection handlers in TextView" 2010-07-13 09:46:41 -07:00
Joe Malin
6d2a4c5c70 Merge "DO NOT MERGE Doc Change: Javadoc for test case classes" into gingerbread 2010-07-13 09:46:38 -07:00
Romain Guy
87c7e48a81 Merge "Correctly support pre-multiplied alpha, optimizations, more stuff." 2010-07-12 20:23:03 -07:00
Dianne Hackborn
e105effd6a am b0e787d2: am e339464f: am 1bcb6658: Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 
Merge commit 'b0e787d2d67d1214b3233b822a5ed2517c8e0557'

* commit 'b0e787d2d67d1214b3233b822a5ed2517c8e0557':
  Fix issue #2834005: Android Settings.Secure bypass
 2010-07-12 19:11:03 -07:00
Dianne Hackborn
ea76c7d5d0 am e339464f: am 1bcb6658: Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 
Merge commit 'e339464f1c8efe7e53b761cf44ff5be6e537ecad' into gingerbread-plus-aosp

* commit 'e339464f1c8efe7e53b761cf44ff5be6e537ecad':
  Fix issue #2834005: Android Settings.Secure bypass
 2010-07-12 19:08:47 -07:00
Dianne Hackborn
281d8f991e am 1bcb6658: Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 
Merge commit '1bcb665825dc97789e8c1b892ec4298fd0b8c552' into gingerbread

* commit '1bcb665825dc97789e8c1b892ec4298fd0b8c552':
  Fix issue #2834005: Android Settings.Secure bypass
 2010-07-12 19:06:24 -07:00
Dianne Hackborn
85001bc578 Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 2010-07-12 19:03:26 -07:00
Dianne Hackborn
8a5e3c9a62 Merge "Some improvements to ListFragment." 2010-07-12 17:46:48 -07:00
Dirk Dougherty
fd9caf5b86 am 6ba9e6fb: am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread 
Merge commit '6ba9e6fbef64da3dacb66e2833ce847e94694d7e'

* commit '6ba9e6fbef64da3dacb66e2833ce847e94694d7e':
  Doc change: add notes for ndk r4b.
 2010-07-12 17:45:12 -07:00
Dirk Dougherty
ec3f497038 am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread 
Merge commit '5a93032dcbe54223e03102d497d7e04370491737' into gingerbread-plus-aosp

* commit '5a93032dcbe54223e03102d497d7e04370491737':
  Doc change: add notes for ndk r4b.
 2010-07-12 17:42:33 -07:00
Dirk Dougherty
8728c6a548 doc change: resolved conflicts for merge of 3c691a8d to gingerbread 
Conflicts:
	docs/html/sdk/android-2.2.jd

Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438
 2010-07-12 17:30:05 -07:00
Kenny Root
79855d337d Merge "Change Javadoc to get around brokenness" 2010-07-12 17:13:48 -07:00
The Android Open Source Project
a98e7e1043 am 7b1a2079: merge from open-source master 
Merge commit '7b1a2079227cd93d1d92088fed0df2351705cbe4'

* commit '7b1a2079227cd93d1d92088fed0df2351705cbe4':
  Fixed a Documentation Error in the AsyncTask Contstructor
 2010-07-12 15:40:34 -07:00
The Android Open Source Project
cc2774bac9 am f079a659: merge from open-source master 
Merge commit 'f079a659774473324b5739652c014229189a10ff'

* commit 'f079a659774473324b5739652c014229189a10ff':
  Fix hang when error in SIM card communication
 2010-07-12 15:36:24 -07:00
The Android Open Source Project
2cb8e28d39 merge from open-source master 
Change-Id: I48def3afdbc7ac72ea624d8ad350c4722262690e
 2010-07-12 15:35:31 -07:00
The Android Open Source Project
bd240840e7 am b65d2256: merge from open-source master 
Merge commit 'b65d225633d14326d1ba2af862861e92d7ea45bc'

* commit 'b65d225633d14326d1ba2af862861e92d7ea45bc':
  Reduced Warnings by adding Type Arguments and removing unused imports
 2010-07-12 15:30:04 -07:00
The Android Open Source Project
6c09cab6ed merge from open-source master 
Change-Id: I3af7e5270229f9fc6c57c9449052025af2a9bdca
 2010-07-12 15:28:22 -07:00
The Android Open Source Project
0e10c129b9 merge from open-source master 
Change-Id: I992e2a407b1d8f7f29cb7153d4c2e3945e60b57a
 2010-07-12 15:26:21 -07:00
The Android Open Source Project
7e3a80a80f am 6fb70b5a: merge from open-source master 
Merge commit '6fb70b5a9f41f198ee4bc1ed3efeca6f8ccdc5d9'

* commit '6fb70b5a9f41f198ee4bc1ed3efeca6f8ccdc5d9':
  Documentation Bug (Issue 9557)
 2010-07-12 15:24:45 -07:00
The Android Open Source Project
772706fe45 merge from open-source master 
Change-Id: Ib01b5c62c229817b6620692a8ae0211230813899
 2010-07-12 15:21:50 -07:00
Robert Ly
d164695d3d am f9a71640: am b1008010: am ef13d028: docchange: fixed typo "Pacskage" to "Package" 
Merge commit 'f9a71640b8ffa1dd1c727f7dd5f33e710dc31c49'

* commit 'f9a71640b8ffa1dd1c727f7dd5f33e710dc31c49':
  docchange: fixed typo "Pacskage" to "Package"
 2010-07-12 15:14:32 -07:00
Robert Ly
267569494f am b1008010: am ef13d028: docchange: fixed typo "Pacskage" to "Package" 
Merge commit 'b10080106909fd860ed33ac46de9f2f084e358d6' into gingerbread-plus-aosp

* commit 'b10080106909fd860ed33ac46de9f2f084e358d6':
  docchange: fixed typo "Pacskage" to "Package"
 2010-07-12 15:11:25 -07:00
Robert Ly
cee6103d08 am ef13d028: docchange: fixed typo "Pacskage" to "Package" 
Merge commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f' into gingerbread

* commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f':
  docchange: fixed typo "Pacskage" to "Package"
 2010-07-12 15:07:40 -07:00
Romain Guy
1ce3ae3230 Merge "Remove math from the vertex shader." 2010-07-12 14:17:16 -07:00
David Brown
aab0ee2fe3 am 523959f5: am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread 
Merge commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc'

* commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc':
  Deprecate some status bar icons that now come from the phone app (and
 2010-07-12 13:35:49 -07:00
David Brown
2787a7cfe6 am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread 
Merge commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540' into gingerbread-plus-aosp

* commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540':
  Deprecate some status bar icons that now come from the phone app (and
 2010-07-12 13:32:54 -07:00