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

18174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Brown
188d3b0a28 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 2010-07-12 13:30:58 -07:00
Jason Sams
e0f1cff1fa gl perf test cleanup. 
Change-Id: Ic486774e25421bd2f412f0ba2bbac4660e3982b8
 2010-07-12 11:59:34 -07:00
Patrick Dubroy
806f633780 Merge "Convert the minWidth and minHeight to device units when calling getInstalledProviders" 2010-07-12 11:40:58 -07:00
Romain Guy
3e57d20b63 Merge "Fixed a Documentation Error in the AsyncTask Contstructor" 2010-07-12 11:35:31 -07:00
Kenny Root
d441a0ca24 am ceb8465e: am 87bb1857: Merge changes I2337051b,I19b426cb into gingerbread 
Merge commit 'ceb8465e974ba5fa971ffe1b5b74e94a1bd53f97'

* commit 'ceb8465e974ba5fa971ffe1b5b74e94a1bd53f97':
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
 2010-07-12 11:22:45 -07:00
Kenny Root
723499ae23 am 87bb1857: Merge changes I2337051b,I19b426cb into gingerbread 
Merge commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd' into gingerbread-plus-aosp

* commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd':
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
 2010-07-12 11:20:04 -07:00
Kenny Root
9baa2c7a44 Merge changes I2337051b,I19b426cb into gingerbread 
* changes:
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
 2010-07-12 11:18:34 -07:00
Jean-Baptiste Queru
4d360bae07 Merge "Fix hang when error in SIM card communication" 2010-07-12 11:14:56 -07:00
Jean-Baptiste Queru
8b620f3457 Merge "Reduced Warnings by adding Type Arguments and removing unused imports" 2010-07-12 10:54:11 -07:00
Jean-Baptiste Queru
34cc65ebb4 Merge "Documentation Bug (Issue 9557)" 2010-07-12 10:43:17 -07:00
Tadashi G. Takaoka
08e74c7ede Merge "Fix that setInputMethod throw exception with wrong method id" 2010-07-12 10:41:08 -07:00
Maksymilian Osowski
6b1d08b28c Merge "Added dialogs to the DirListActivity." 2010-07-12 10:40:15 -07:00
Steve Block
9b9c788142 Merge "Update DumpRenderTree to look in platform/android for Android-specific results" 2010-07-12 10:01:50 -07:00
Mike Lockwood
95f21811ed Merge "MediaProvider: Add constants for media_table and media_id columns in MTP objects table" 2010-07-12 09:54:32 -07:00
Andy McFadden
2355c9df02 Merge "Fix build." 2010-07-12 09:19:05 -07:00
Andy McFadden
a5c381fd51 Fix build. 
Added missing #include <string.h>.

Change-Id: Idf151876851110098fe538a042f896784821919b
 2010-07-12 09:17:13 -07:00
Kenny Root
fa59afb863 Tweak ObbFile class 
* Move error messages around to clarify the errors.

* Add extra error check when reading a file.

* Seek to the end of a file when writing the signature so the users of
  the API don't have to remember to do it.

Change-Id: I2337051b9f9fa8147c5900237deec790dcd92436
 2010-07-12 09:11:24 -07:00
Dianne Hackborn
e5c1f0321b am bbf0bde5: am faccac76: Make a stupid thing about the glue less stupid. 
Merge commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7'

* commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7':
  Make a stupid thing about the glue less stupid.
 2010-07-09 18:30:22 -07:00
Dianne Hackborn
7b48b5f6c8 am faccac76: Make a stupid thing about the glue less stupid. 
Merge commit 'faccac7616795859af257777900db514d425a106' into gingerbread-plus-aosp

* commit 'faccac7616795859af257777900db514d425a106':
  Make a stupid thing about the glue less stupid.
 2010-07-09 18:27:51 -07:00
Dianne Hackborn
47c320febd am b14f325a: am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits. 
Merge commit 'b14f325a0118ffce286155caaabaae149653462c'

* commit 'b14f325a0118ffce286155caaabaae149653462c':
  Add ANativeWindow API for directly drawing to the surface bits.
 2010-07-09 17:05:23 -07:00
Dianne Hackborn
c9ab2f8f90 am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits. 
Merge commit '289b9b62372ef52a06113b83dfb870e2c2fb325a' into gingerbread-plus-aosp

* commit '289b9b62372ef52a06113b83dfb870e2c2fb325a':
  Add ANativeWindow API for directly drawing to the surface bits.
 2010-07-09 17:03:14 -07:00
Dianne Hackborn
9147d11a5f Add ANativeWindow API for directly drawing to the surface bits. 
Also other cleanup and fixes:

- We now properly set the default window format to 565.
- New APIs to set the window format and flags from native code.
- Tweaked glue for simpler handling of the "destroy" message.
- Um, other stuff.

Change-Id: Id7790a21a2fa9a19b91854d225324a7c1e7c6ade
 2010-07-09 16:58:19 -07:00
Gilles Debunne
c6226ac949 Merge "New cursor controller in TextViews." 2010-07-09 16:22:30 -07:00
Romain Guy
88604725a5 Merge "Fix alpha blending and improve fragment shaders performance." 2010-07-09 16:15:35 -07:00
The Android Open Source Project
89f5c210bb am 0260887c: merge from open-source master 
Merge commit '0260887ca78330b8dd7009d91859925df94a69d6'

* commit '0260887ca78330b8dd7009d91859925df94a69d6':
  Improved logging when there's an error creating the directories in getFilesDir()
 2010-07-09 16:01:00 -07:00
The Android Open Source Project
2196401413 merge from open-source master 
Change-Id: Ia0dff818a574c8bc79aa79d65fd21bab9f9f6c30
 2010-07-09 15:59:17 -07:00