26673 Commits

Author SHA1 Message Date
James Dong
70c6c9a1e2 Fix simulator build
- missing header file <string.h>
- need to define -D__arm__

Change-Id: I18d2f1908684150784cf728234b5aedbc02447d1
2010-07-13 13:29:33 -07:00
Konstantin Lopyrev
dd3e63c1d4 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
29227aafa0 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
c1ca7f8c53 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
4c14a0f13f 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
47b46648b5 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
b8d890ebc1 Merge "Initial implementation of the download manager public API." into gingerbread 2010-07-13 13:01:41 -07:00
Alex Sakhartchouk
250fd1144f 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
72c37ff17a 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
405278954f 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
10dde21145 merge from open-source master
Change-Id: Id2ad46118e0ca957b65b911c52d7bbcf2a4649a2
2010-07-13 12:33:22 -07:00
Eric Laurent
66fa2b44ca 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
8e886be413 Merge "Modifications in audio effect engine state management." into gingerbread 2010-07-13 12:29:17 -07:00
Eric Laurent
7d850f23c8 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
09d7d7dbc3 Merge "Allow "am" to initiate heap dumps." 2010-07-13 12:19:52 -07:00
Romain Guy
46c076d193 Merge "Cleanup: remove unnecessary parameters." 2010-07-13 11:37:58 -07:00
Romain Guy
a979474f15 Cleanup: remove unnecessary parameters.
Change-Id: I5956ef1db6be28a01369387aaeeb65a94656c48c
2010-07-13 11:37:54 -07:00
Steve Howard
a270936066 Initial implementation of the download manager public API.
The implementation is in android.net.DownloadManager, which is
obtained through Context.getSystemService().  Right now this class
acts as a simple wrapper on top of the existing DownloadProvider,
exposing a simple interface to a subset of DownloadProvider's
functionality.  There are several TODOs for features that require
changes to the underlying download manager implementation.

Change-Id: I2f26e51b60b6e82af8478ac7ccd895667df095b6
2010-07-13 11:12:16 -07:00
James Dong
fc0d81c642 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
f6bdc764b7 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
9d8bea1189 Merge "Initial checkin for software AVC encoder" into gingerbread 2010-07-13 10:59:34 -07:00
James Dong
1cc31e629e Initial checkin for software AVC encoder
- Since the software encoder assumes the input is YUV420 planar,
  color conversion needs to be added when the input color format
  does not meet the requirement. With this patch, I only added
  a single color conversion from YUV420 semi planar to YUV420
  planar. We can add more as we go.

Change-Id: If8640c9e5a4f73d385ae9bb2022e57f7f62b91b9
2010-07-13 10:58:20 -07:00
Martin Sjolin
e74e7e2a08 Remove top panel in alert dialog if empty.
Remove the topPanel in the alert dialog if it is empty and
therefore invisible. This gives the dialog content more space, and it
makes dialog positioning on the screen correct.

Change-Id: I8ffd9bd9b2360b0ad4338c32c21ab69c055d66a0
2010-07-13 10:47:26 -07:00
Gilles Debunne
37b76cdcb4 Fix broken build.
make update-api missing after latest sync in 57362.

Change-Id: I31e2c485ca8f43ddb8d7944a3f1ab6a14431409d
2010-07-13 10:35:56 -07:00
Joe Malin
ec5907e2bf 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
95ccd87582 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
fef09f1e17 Merge "Revert to an uncompressed MccTable." 2010-07-13 09:48:36 -07:00
Gilles Debunne
8b451fcc84 Merge "Selection handlers in TextView" 2010-07-13 09:46:41 -07:00
Joe Malin
d93f4e5b70 Merge "DO NOT MERGE Doc Change: Javadoc for test case classes" into gingerbread 2010-07-13 09:46:38 -07:00
Robert Greenwalt
e2043da015 Revert to an uncompressed MccTable.
The compressed MccTable didn't have enough space for all the timezones or languages in the world.
We can remove the timezones entirely by looking up the timezone from the ICU data.  Since there
is not much to be gained from the binary format and it had real limitations we chose
to revert it.

Fixed a bug where the wifi channel was never being set.

bug:2284210
Change-Id: If9ca89f7053f937f555430b061c60cd7eec86d8e
2010-07-13 09:31:24 -07:00
Romain Guy
92429d9266 Fix premultiplied alpha.
Change-Id: I08da422c5350503e1f4f27b9890f15a813d0c6c7
2010-07-12 20:27:17 -07:00
Romain Guy
c7f3ce8401 Merge "Correctly support pre-multiplied alpha, optimizations, more stuff." 2010-07-12 20:23:03 -07:00
Romain Guy
6926c72e25 Correctly support pre-multiplied alpha, optimizations, more stuff.
Add support for the following drawing functions:
- drawBitmap(int[]...)
- drawPaint()

Optimizes shader state changes by enabling/disabling attribute arrays
only when needed.

Adds quick rejects when drawing trivial shapes to avoid unnecessary
OpenGL operations.

Change-Id: Ic2c6c2ed1523d08a63a8c95601a1ec40b6c7fbc9
2010-07-12 20:20:03 -07:00
Konstantin Lopyrev
dc30101ff8 Making sure that the list of windows updates automatically in hierarchy viewer (View Server side)
Change-Id: I0f49ee8b6950ad167bd224093150050e19fd1dd7
2010-07-12 19:37:24 -07:00
Dianne Hackborn
7e92b2d9e4 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
b0e787d2d6 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
e339464f1c 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
1bcb665825 Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 2010-07-12 19:03:26 -07:00
Gilles Debunne
05336274dd Selection handlers in TextView
Long press on text view triggers selection mode. Two handles can be used to
adjust selection.

Change-Id: I45bb5fd62cae910570cff34920e45c4383160179
2010-07-12 18:45:40 -07:00
Dianne Hackborn
36febe1e04 Merge "Some improvements to ListFragment." 2010-07-12 17:46:48 -07:00
Dianne Hackborn
ef769f6e48 Some improvements to ListFragment.
- Take care of hiding/showing list automatically for normal behavior.
- Make list_content public for others to use.

Change-Id: Iecb7b70775d390d4e28e5c0dd6ba7278581b2734
2010-07-12 17:45:51 -07:00
Dirk Dougherty
798dc2f518 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
6ba9e6fbef 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
5a93032dcb 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
Dianne Hackborn
24117ce3ae Fix issue #2834005: Android Settings.Secure bypass
Change-Id: Ic4f14e2ff5c2b4f623405d30389863a9e3e82572
2010-07-12 17:21:50 -07:00
Kenny Root
8335619363 Merge "Change Javadoc to get around brokenness" 2010-07-12 17:13:48 -07:00
Dirk Dougherty
3c691a8d7f Doc change: add notes for ndk r4b.
Change-Id: Idf4e4d2ac2ed9c30b3afe258546861084f3f20aa
2010-07-12 15:51:01 -07:00
Alex Sakhartchouk
80a4c2cd34 Work on synchronizing a3d created files and java layer.
Adding culling to ProgramRaster

Change-Id: I58ccc82d37edc9539289d5eba44ea0e720874af5
2010-07-12 15:50:32 -07:00
The Android Open Source Project
2a6560bcb8 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
7832efe7da 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