26512 Commits

Author SHA1 Message Date
Xia Wang
eff55802b5 am f3bfd841: am 98738272: Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread
Merge commit 'f3bfd841019b404f98a67fc307240031790344c9'

* commit 'f3bfd841019b404f98a67fc307240031790344c9':
  Remove voice mail number verification for testing on no-sim device
2010-07-08 19:09:28 -07:00
Scott Main
9df613a7df am 717b517a: am 1082ae03: am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo
Merge commit '717b517ab319b336a406d6df0926b30a1ea84bf8'

* commit '717b517ab319b336a406d6df0926b30a1ea84bf8':
  docs: add caution about adt in eclipse 3.6
2010-07-08 19:09:23 -07:00
Kenny Root
511d9ec363 am 0a21801f: am a5402dab: Merge "OBB API for PackageManager" into gingerbread
Merge commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b'

* commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b':
  OBB API for PackageManager
2010-07-08 19:09:06 -07:00
Kenny Root
28e230352b am d481cdd4: am c9535de8: Merge "Add OBB file helper class" into gingerbread
Merge commit 'd481cdd4c0305f8afd857fe3ec3fbf189b744370'

* commit 'd481cdd4c0305f8afd857fe3ec3fbf189b744370':
  Add OBB file helper class
2010-07-08 19:08:57 -07:00
Jeff Brown
1a33274d28 resolved conflicts for merge of 167449e5 to master
Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67
2010-07-08 19:01:13 -07:00
Adam Powell
6f10db885f Merge "Fix some issues with smooth scrolling ListViews" 2010-07-08 18:39:42 -07:00
Dianne Hackborn
53c67c8dfd Fix build.
Change-Id: I60185df6150d13d704a28933bc919527da173307
2010-07-08 18:27:42 -07:00
Adam Powell
371133174b Fix some issues with smooth scrolling ListViews
Change-Id: I8b0f3d318eb0508ed12b92584c368e6f0edeb0be
2010-07-08 18:21:48 -07:00
David Brown
54934964e7 Remove some (unused, non-public) phone-related status bar notification icons
Status bar icons really belong to specific apps (not the framework), so the
various stat_sys_phone_call* and stat_sys_vp_phone_call* icons should have
never been part of the framework in the first place.

As of change https://android-git.corp.google.com/g/56881 the phone app now has
its own copies of all these icons, so it's now safe to remove the non-public
ones(*) from frameworks/base.

(*) Unfortunately a few of these icons were accidentally added to public.xml
    at some point, so we'll never be able to get rid of those ones.
    This change only removes the private resources.

Change-Id: If9ecf7b7568b5086c6ed1e5d4b69518fb41f1516
2010-07-08 18:15:42 -07:00
Jean-Baptiste Queru
cb5357c43d Merge "update 404'd source.android.com URLs" 2010-07-08 16:25:03 -07:00
Eric Laurent
b4b0f67a47 am fd84f97a: Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
Merge commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2' into gingerbread-plus-aosp

* commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2':
  Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
2010-07-08 16:14:31 -07:00
Kenny
36a86649db Fix send/receive MMS while the phone's state isn't in IDLE and the Network type can support voice and data calls concurrently
Change-Id: I67e5b1f6e4f855cc09dd76c251a86a06990b6499
2010-07-08 15:51:48 -07:00
Eric Laurent
fd84f97af4 Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
Defined the following JAVA classes on top of AudioEffect class to facilitate control
off built-in audio effects with APIs aligned with interfaces defined in OpenSL ES
specification:
- BastBoot.java
- Equalizer.java
- PresetReverb.java
- EnvironmentalReverb.java
- Virtualizer.java

Split reverb API header file in two, one for preset reverb and one for environmental reverb.
Some changes in test reverb to support preset reverb.

Change-Id: Ie0a5ba06002e63dfd6da22cace5568c1e0b76ea1
2010-07-08 15:32:51 -07:00
Dianne Hackborn
c801768e4d Integrate Loader support in to Activity/Fragment.
Introduces a new LoaderManager class that takes care of
most of what LoaderManagingFragment does.  Every Fragment
and Activity can have one instance of this class.  In the
future, the instance will be retained across config changes.

Also various other cleanups and improvement.

Change-Id: I3dfb406dca46bda7f5acb3c722efcbfb8d0aa9ba
2010-07-08 15:17:22 -07:00
Grace Kloba
8abd50b748 Combine base PictureSet with composite layers into
one SkLayer tree to get ready for GL rendering.

Now UI holds its copy of SkLayer tree. The top node
is BaseLayerAndroid which has the PictureSet as its
content.

There is a matching change in external/webkit.
2010-07-08 15:02:14 -07:00
Mike Lockwood
2951c6d057 Merge "MTP: Use media provider database to implement MTP device support." 2010-07-08 14:29:59 -07:00
Brett Chabot
243f7f85ea am f6120cf4: Merge "Improve InstrumentationTestRunner exception handling." into gingerbread
Merge commit 'f6120cf431804e072f34699a5d8a3fae62492cee' into gingerbread-plus-aosp

* commit 'f6120cf431804e072f34699a5d8a3fae62492cee':
  Improve InstrumentationTestRunner exception handling.
2010-07-08 14:12:10 -07:00
Vasu Nori
07e1b1dd16 Merge "reduce java locking on SQLiteDatabase if sql is already compiled" 2010-07-08 14:10:16 -07:00
Brett Chabot
f6120cf431 Merge "Improve InstrumentationTestRunner exception handling." into gingerbread 2010-07-08 14:09:21 -07:00
Mike Lockwood
d21eac9c70 MTP: Use media provider database to implement MTP device support.
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.

The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.

Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-08 16:21:09 -04:00
Mike Lockwood
6d9e1e63a4 Merge "MTP: remove separate audio table from prototype MTP database" 2010-07-08 13:09:17 -07:00
Mike Lockwood
2d6c9e9c4e MTP: remove separate audio table from prototype MTP database
Change-Id: I5e4b49b741a0a3c6ddf5afcbb20a0d7c9515c8ce
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-08 16:02:16 -04:00
Romain Guy
26be805f42 Merge "Do not draw the fade areas when it's not necessary." 2010-07-08 12:54:25 -07:00
Vasu Nori
b2d2ddc5ac reduce java locking on SQLiteDatabase if sql is already compiled
Change-Id: I6c2c593ba69aad201cedf097384d0b5d835c0839
2010-07-08 12:53:22 -07:00
Romain Guy
dac5f9f3ca Do not draw the fade areas when it's not necessary.
Prior to this change, every singleLine TextView would create, draw
and compose a layer on every draw dispatch. This was unnecessary and
expensive.

Change-Id: Ia4f79d7fc8f485784fe6b795f0f196d38d579838
2010-07-08 12:52:25 -07:00
Daniel Sandler
841b176dc0 Make android:immersive public.
This exposes the AndroidManifest attribute
android:immersive, introduced in Change I967bb10b, to the
SDK.

Change-Id: Iccbc99590cd0fd4c570b9b9670ef93036f9d849e
2010-07-08 15:39:22 -04:00
Dianne Hackborn
49159f0748 am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread
Merge commit '74bf59b450daf9e7e6bf234f01db164099edbfd5' into gingerbread-plus-aosp

* commit '74bf59b450daf9e7e6bf234f01db164099edbfd5':
  Add new glue code for writing native apps.
2010-07-08 12:26:32 -07:00
Dianne Hackborn
74bf59b450 Merge "Add new glue code for writing native apps." into gingerbread 2010-07-08 12:25:20 -07:00
Jason Parks
49ff1e6c6c am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread
Merge commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f' into gingerbread-plus-aosp

* commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f':
  Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
2010-07-08 11:52:01 -07:00
Jason Parks
b29e3b9cd0 Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread 2010-07-08 11:50:40 -07:00
Romain Guy
818505aa30 Merge "Create FBOs in LayerCache." 2010-07-08 11:48:34 -07:00
Romain Guy
f18fd99b5c Create FBOs in LayerCache.
This moves a bit of code away from OpenGLRenderer and matches
what happens with the TextureCache.

Change-Id: I3c67f54f83d7240770daa015861c0e75a1dd8c42
2010-07-08 11:45:51 -07:00
Vasu Nori
a3dcc4cc7e Merge "STOPSHIP CL in master - make sqlite WAL default for all apps" 2010-07-08 11:43:24 -07:00
Scott Main
9fd45970de am 833830e0: am 286cf139: docs: add redirect for download.html
Merge commit '833830e0640cd25dcf3ed29ea5a9bd835caded13' into gingerbread-plus-aosp

* commit '833830e0640cd25dcf3ed29ea5a9bd835caded13':
  docs: add redirect for download.html
2010-07-08 11:42:53 -07:00
Vasu Nori
57feb5d9a7 STOPSHIP CL in master - make sqlite WAL default for all apps
for testing the sqlite WAL feature in the next few weeks.

Change-Id: I07234647b5e90d9e3bb0a5310b6cc449d58db428
2010-07-08 11:41:52 -07:00
Scott Main
833830e064 am 286cf139: docs: add redirect for download.html
Merge commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62' into gingerbread

* commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62':
  docs: add redirect for download.html
2010-07-08 11:40:11 -07:00
Scott Main
286cf139c3 docs: add redirect for download.html
Change-Id: Id54f1899c1933796524d6c2b5e991a652b354287
2010-07-08 11:26:36 -07:00
Dianne Hackborn
85448bbecd Add new glue code for writing native apps.
This factors out the boiler-plate code from the sample
app to a common glue code that can be used for everyone
writing this style of app: a dedicated app thread that
takes care of waiting for events and processing them.

As part of doing this, ALooper has a new facility to allow
registration of fds that cause ALooper_pollOnce() to return
the fd that has data, allowing the app to drive the loop
without callbacks.  Hopefully this makes some people feel better. :)

Also do some other cleanup of the ALooper API, plus some
actual documentation.

Change-Id: Ic53bd56bdf627e3ba28a3c093faa06a92be522b8
2010-07-08 11:06:59 -07:00
Adam Powell
661c908e4e ActionBar tab mode using fragments; needs styles.
Change-Id: I8f931dae447e7b64de827d3c17766e5f8ad794e2
2010-07-08 10:38:31 -07:00
Daniel Sandler
4dc96b8513 am f7d2b4a2: Use fullScreenIntent to show the USB mass storage dialog.
Merge commit 'f7d2b4a2e096ae1f8ac3a2ed8b2f0e30a237f732' into gingerbread-plus-aosp

* commit 'f7d2b4a2e096ae1f8ac3a2ed8b2f0e30a237f732':
  Use fullScreenIntent to show the USB mass storage dialog.
2010-07-08 10:29:26 -07:00
Daniel Sandler
f7d2b4a2e0 Use fullScreenIntent to show the USB mass storage dialog.
Note that this is not a FLAG_HIGH_PRIORITY notification. In
immersive mode the UMS dialog will be suppressed entirely
(but an icon will still appear in the status bar).

Bug: 2821219
Change-Id: I21f910c8830aff8d0633deda4eb59dbda13262ed
2010-07-08 13:07:41 -04:00
Jason Parks
bca909c0a5 Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
Not closing the cursors was a bit of a bug since the documenation explicitly says that it would close the cursors. This will get rid of all the warnings that are printed out in the finalizer about the cursor not being closed.
2010-07-08 09:02:48 -05:00
Ben Murdoch
31a4dbf5ca Fix NPE in the webruntime after the splash screen has been dismissed.
Change-Id: I91a01cf34f54ef07d4f175a3e5cd3b40086a6f07
2010-07-08 12:26:50 +01:00
Dan Tasse
768d98e5f3 am 7017e0d5: am f3f25bf8: Added some javadoc to Camera.takePicture()
Merge commit '7017e0d5c372db1e470d9881c46b15eade051d76'

* commit '7017e0d5c372db1e470d9881c46b15eade051d76':
  Added some javadoc to Camera.takePicture()
2010-07-07 20:55:47 -07:00
Eric Laurent
98449546fa am b91881fd: am dacabf97: Merge "Added Visualizer effect." into gingerbread
Merge commit 'b91881fdd1608cc922f105ec552b5505da1fecb9'

* commit 'b91881fdd1608cc922f105ec552b5505da1fecb9':
  Added Visualizer effect.
2010-07-07 20:55:40 -07:00
Xia Wang
f3bfd84101 am 98738272: Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread
Merge commit '98738272e3b680559e1e0a7b665a0ebb4038f684' into gingerbread-plus-aosp

* commit '98738272e3b680559e1e0a7b665a0ebb4038f684':
  Remove voice mail number verification for testing on no-sim device
2010-07-07 19:05:48 -07:00
Xia Wang
98738272e3 Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread 2010-07-07 19:04:03 -07:00
Jason Sams
9c959e77f1 Merge "Fix image processing resource problem for non high-density devices. Protect include file." 2010-07-07 18:52:21 -07:00
Jason Sams
f26d01a7ce Merge "Add boolean support for setVar." 2010-07-07 18:52:03 -07:00
Fabrice Di Meglio
07b236edce Merge "Fix bug #2779582 (Columns cleanup for the Calendars table)" 2010-07-07 18:46:10 -07:00