25415 Commits

Author SHA1 Message Date
Jeff Brown
7cbd36f8d7 am 29f28cfe: am e899caf8: Fixed api/current.xml after a bad merge.
Merge commit '29f28cfe2188179519094e35d7fad09588170e88'

* commit '29f28cfe2188179519094e35d7fad09588170e88':
  Fixed api/current.xml after a bad merge.
2010-06-17 13:57:05 -07:00
Jeff Brown
29f28cfe21 am e899caf8: Fixed api/current.xml after a bad merge.
Merge commit 'e899caf8cce1d1a20121f19a99899553ae2b327e' into gingerbread-plus-aosp

* commit 'e899caf8cce1d1a20121f19a99899553ae2b327e':
  Fixed api/current.xml after a bad merge.
2010-06-17 13:53:48 -07:00
Jeff Brown
e899caf8cc Fixed api/current.xml after a bad merge.
Change-Id: I033f417e928eb541f0528521326b66776a3c9096
2010-06-17 13:49:02 -07:00
Romain Guy
3b970e78d2 Merge "Add libhwui, to hardware accelerate the Canvas API using OpenGL ES 2.0." 2010-06-17 13:42:37 -07:00
Romain Guy
e4d011201c Add libhwui, to hardware accelerate the Canvas API using OpenGL ES 2.0.
This is the initial checkin to setup the library and turn on OEGL ES 2.0
in ViewRoot, not a functional renderer.

Change-Id: I6655c54166e2967da2e21e7d6dcfba78bf113b44
2010-06-17 13:40:11 -07:00
Jeff Brown
4e74ae3d5b am 42bb545a: am 5c225b16: Even more native input dispatch work in progress.
Merge commit '42bb545a54d89f0ddbb230d7a01ea4210c0f6c00'

* commit '42bb545a54d89f0ddbb230d7a01ea4210c0f6c00':
  Even more native input dispatch work in progress.
2010-06-17 13:32:45 -07:00
Jeff Brown
42bb545a54 am 5c225b16: Even more native input dispatch work in progress.
Merge commit '5c225b1680e696ae8bbf505a1997d6f720672f74' into gingerbread-plus-aosp

* commit '5c225b1680e696ae8bbf505a1997d6f720672f74':
  Even more native input dispatch work in progress.
2010-06-17 13:31:07 -07:00
Daniel Sandler
733c6f2e9b am 747f75dc: am 3a0146cd: Merge "New API for "immersive" activity windows." into gingerbread
Merge commit '747f75dc0882138828ac2b2752c2872ccae49747'

* commit '747f75dc0882138828ac2b2752c2872ccae49747':
  New API for "immersive" activity windows.
2010-06-17 13:27:47 -07:00
Daniel Sandler
c68b6e893a am 04b4f781: am cc86c933: Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread
Merge commit '04b4f781b118fa9c815910bf5d2a772cdfef07c2'

* commit '04b4f781b118fa9c815910bf5d2a772cdfef07c2':
  New API for high-priority Notifications and full-screen alerts.
2010-06-17 13:27:34 -07:00
Jeff Brown
5c225b1680 Even more native input dispatch work in progress.
Added more tests.
Fixed a regression in Vector.
Fixed bugs in pointer tracking.
Fixed a starvation issue in PollLoop when setting or removing callbacks.
Fixed a couple of policy nits.

Modified the internal representation of MotionEvent to be more
efficient and more consistent.

Added code to skip/cancel virtual key processing when there are multiple
pointers down.  This helps to better disambiguate virtual key presses
from stray touches (such as cheek presses).

Change-Id: I2a7d2cce0195afb9125b23378baa94fd2fc6671c
2010-06-17 13:27:16 -07:00
Daniel Sandler
747f75dc08 am 3a0146cd: Merge "New API for "immersive" activity windows." into gingerbread
Merge commit '3a0146cd29fae3c5bc29d8d535d67826284f8cc9' into gingerbread-plus-aosp

* commit '3a0146cd29fae3c5bc29d8d535d67826284f8cc9':
  New API for "immersive" activity windows.
2010-06-17 13:26:03 -07:00
Daniel Sandler
04b4f781b1 am cc86c933: Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread
Merge commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf' into gingerbread-plus-aosp

* commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf':
  New API for high-priority Notifications and full-screen alerts.
2010-06-17 13:25:56 -07:00
Daniel Sandler
3a0146cd29 Merge "New API for "immersive" activity windows." into gingerbread 2010-06-17 13:24:01 -07:00
Daniel Sandler
cc86c933f6 Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread 2010-06-17 13:23:59 -07:00
Dave Sparks
6ab8346a03 am c05c83e2: am f3c6c982: am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly hig
Merge commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2'

* commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:46:07 -07:00
Scott Main
121ac1e5a2 am b8ce7bca: am 78e6622f: am 821ca518: docs: edits to resources doc
Merge commit 'b8ce7bca82882e81041a3e5bddbcaa073fb37234'

* commit 'b8ce7bca82882e81041a3e5bddbcaa073fb37234':
  docs: edits to resources doc
2010-06-17 12:46:03 -07:00
Scott Main
dbd9d79d7d am c65d4c10: am d22bffdf: am bccedb03: docs: update dashboard again
Merge commit 'c65d4c107f7c9bab731b198281109e576c2f6956'

* commit 'c65d4c107f7c9bab731b198281109e576c2f6956':
  docs: update dashboard again
2010-06-17 12:45:58 -07:00
Dan Morrill
a1b6dba25f am dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7'

* commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:45:53 -07:00
Dave Sparks
c05c83e272 am f3c6c982: am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than norm
Merge commit 'f3c6c982f68e6ada3cded6923301d2f6236f3c17' into gingerbread-plus-aosp

* commit 'f3c6c982f68e6ada3cded6923301d2f6236f3c17':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:42:24 -07:00
Scott Main
b8ce7bca82 am 78e6622f: am 821ca518: docs: edits to resources doc
Merge commit '78e6622fbb2bacdac68269b60cc694275ae132a4' into gingerbread-plus-aosp

* commit '78e6622fbb2bacdac68269b60cc694275ae132a4':
  docs: edits to resources doc
2010-06-17 12:42:21 -07:00
Scott Main
c65d4c107f am d22bffdf: am bccedb03: docs: update dashboard again
Merge commit 'd22bffdf6f2f899913c4dcf7fa75241f7c270059' into gingerbread-plus-aosp

* commit 'd22bffdf6f2f899913c4dcf7fa75241f7c270059':
  docs: update dashboard again
2010-06-17 12:42:18 -07:00
Dan Morrill
dde1ae841a am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8' into gingerbread-plus-aosp

* commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:42:14 -07:00
Dave Sparks
f3c6c982f6 am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into gingerbread

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:37:15 -07:00
Scott Main
78e6622fbb am 821ca518: docs: edits to resources doc
Merge commit '821ca51857f4d21b231cd9ead786227b771fe759' into gingerbread

* commit '821ca51857f4d21b231cd9ead786227b771fe759':
  docs: edits to resources doc
2010-06-17 12:37:06 -07:00
Scott Main
d22bffdf6f am bccedb03: docs: update dashboard again
Merge commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222' into gingerbread

* commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222':
  docs: update dashboard again
2010-06-17 12:36:31 -07:00
Dan Morrill
45378f07b8 am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread

* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:36:17 -07:00
James Dong
a05d4d886a am 48a7c1d2: am 42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c'

* commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c':
  Check and clip some video encoding parameters against media profiles before passing them to video encoder
2010-06-17 11:50:46 -07:00
James Dong
48a7c1d25f am 42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit '42a18c09e7bb9c372382e88053409c25563ae7c9' into gingerbread-plus-aosp

* commit '42a18c09e7bb9c372382e88053409c25563ae7c9':
  Check and clip some video encoding parameters against media profiles before passing them to video encoder
2010-06-17 11:49:17 -07:00
Adam Powell
94859061e9 Merge "Merging ActionBar menu with options menu." 2010-06-17 11:38:36 -07:00
Adam Powell
96675b1df3 Merging ActionBar menu with options menu.
Options menu items may now specify if they would like to appear in the
action bar. Menu items defined in xml may set the showAsAction
attribute to one of "never"(default), "ifRoom", or "always". Action
buttons are populated as follows:

* All showAsAction="always" items become action buttons, even if it
  would crowd the navigation area of the action bar.

* If there is space remaining, showAsAction="ifRoom" items are added
  until no more will fit comfortably.

Action button click events are now handled by the
onOptionsItemSelected method used by the standard options menu.

The construction of options menus now happens earlier in order to
provide data to the action bar. Activities with an action bar can now
expect to have onCreateOptionsMenu called when activity start-up is
complete.

Activity#invalidateOptionsMenu can be used to force a refresh of menu
items where the previous API would use ActionBar#updateActionMenu.

Change-Id: If52ddf1cf9f6926206bcdeadf42072ea2c24fab9
2010-06-17 11:35:43 -07:00
James Dong
42a18c09e7 Check and clip some video encoding parameters against media profiles before passing them to video encoder
Change-Id: I69e0e7411806a4ece6c0bf0e02c74eaaf48a17ac
2010-06-17 11:34:10 -07:00
James Dong
99cc3295cf am d8402d78: am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Merge commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783'

* commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783':
  Remove hard-coded number of audio channels in AudioSource
2010-06-17 11:28:28 -07:00
James Dong
d8402d7861 am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Merge commit 'cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp

* commit 'cd677a30851e4ba8b79a41c20e20220a81719378':
  Remove hard-coded number of audio channels in AudioSource
2010-06-17 11:26:57 -07:00
James Dong
cd677a3085 Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread 2010-06-17 11:25:19 -07:00
Gilles Debunne
e6ac8b9aad Removed API changes from CL 54712.
onLoadClass(Class ) was replaced by onLoadClass(Class<?> ) in CL 54712.
This changes the API and may introduce errors in users' implementations.

Change reverted.

Change-Id: Ie578a444168423959b44857f22e13f004e108965
2010-06-17 10:57:42 -07:00
Gilles Debunne
af51e1deb7 Merge "Removed warnings in LayoutInflater." 2010-06-17 10:05:29 -07:00
Gilles Debunne
10b8c51c48 Merge "Index out of range problem in TextLine." 2010-06-17 10:05:11 -07:00
Daniel Sandler
611fae4c39 New API for "immersive" activity windows.
An "immersive" activity (as indicated by the new
FLAG_IMMERSIVE) is one that wishes to avoid being paused by
full-screen notifications (like an incoming call).
An activity that sets FLAG_IMMERSIVE on its window is
sending a signal to the notification manager, status bar,
etc. that they should try to find some other way to get the
user's attention in high-priority situations.

FLAG_IMMERSIVE should be used exclusively in conjunction
with FLAG_FULL_SCREEN (that is, only activities that hide
the status bar should consider themselves immersive).

Change-Id: Ie290c2e92fc391bcf55edfdb1fbd626cd284e3e2
2010-06-17 11:43:35 -04:00
Daniel Sandler
e46cbd379a New API for high-priority Notifications and full-screen alerts.
* fullScreenIntent: a PendingIntent pointing to a
  full-screen activity or other modal alert experience to be
  shown to the user instead of (or in addition to) a
  traditional status bar notification icon. Example: An
  incoming call should pop up a full-screen activity
  allowing the user to accept or decline the call.

  The old way to accomplish this is to simply fire off the
  full-screen intent directly from the Phone app. By routing
  through the Notification system, we make way for the
  FLAG_IMMERSIVE bit (forthcoming API) which would allow the
  frontmost opaque window to suppress full-screen alerts.

* FLAG_HIGH_PRIORITY: This bit allows a notification to be
  shown in windows that have the FLAG_IMMERSIVE bit set. For
  example, a Notification corresponding to an incoming call
  would be marked HIGH_PRIORITY so that even in an immersive
  activity (i.e. a networked game) the Notification could be
  shown to the user.

Change-Id: I4943e53f425800a6e152bc4992dd41586b43aff8
2010-06-17 11:34:13 -04:00
Dianne Hackborn
e2e97ce116 am 9a1034aa: am 6b7b4845: Various improvements to battery stats collection
Merge commit '9a1034aa9746b94ecb659ea849765a160bdf747e'

* commit '9a1034aa9746b94ecb659ea849765a160bdf747e':
  Various improvements to battery stats collection
2010-06-16 19:55:12 -07:00
Dianne Hackborn
9a1034aa97 am 6b7b4845: Various improvements to battery stats collection
Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp

* commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb':
  Various improvements to battery stats collection
2010-06-16 18:49:28 -07:00
Gilles Debunne
3030193dc1 Removed warnings in LayoutInflater.
These changes are similar to those of CL 49296. They do not include the
generic fixes done on GenericInflater.java, which had issues and broke the build.

Added a asSubClass method in LayoutInflater which will (correctly) throw a
ClassCastException when the inflated class is not a View subclass.

Performance testing on these changes showed a 10% performance improvement,
which is still to be explained.

Change-Id: Id4d3b45f0945baccdbbda15fcce095e855b23c9a
2010-06-16 18:38:13 -07:00
Dianne Hackborn
6b7b484521 Various improvements to battery stats collection
We now clear the battery stats when unplugging after the
battery is full.  This allows us to use the "total" stats as
a new "since last charged" stat.  Total is gone.  I never used
it, it was worthless.  Since last charged is a lot more
interesting.

The battery history now collects a lot more stats, and keeps
control over how much it can collect.  Printing is now more
descriptive.

The kinds of stats have been renamed to SINCE_UNPLUGGED and
SINCE_DISCHARGED.  The other two stats are still there, but
no longer printed; a future change will eliminate them
completely along with all of their state.

Change-Id: I4e9fcfcf8c30510092c76a8594f6021e9502fbc1
2010-06-16 18:31:42 -07:00
Gilles Debunne
345cb03315 Index out of range problem in TextLine.
Recent refactoring for bidi introduced an index shift in the getOffsetBeforeAfter
method. This problem appears for multi-line text input only, when the text line
mStart index is not 0.

As a result, moving the cursor using the trackball in a multi-line EditText crashes.

Change-Id: I1f121f0f9272ef7d338399f369ba6d77e1ca71c5
2010-06-16 17:24:51 -07:00
Fabrice Di Meglio
2f7a247c92 Merge "Fix bug #2772731 (Start deprecation of "url" Calendars column in favor of "eventsUrl" column)" 2010-06-16 17:01:48 -07:00
Fabrice Di Meglio
3067771f81 Fix bug #2772731 (Start deprecation of "url" Calendars column in favor of "eventsUrl" column)
- suppress references to Calendars.URL

Change-Id: Ic1fa5059516ff294940345addf930554aef0a0a9
2010-06-16 16:35:16 -07:00
Gilles Debunne
bc442294c2 Merge "Suppressed warnings in TextView." 2010-06-16 16:29:53 -07:00
Dmitri Plotnikov
b3ec983ca9 Merge "Preventing cursor leaks when a query is interrupted" 2010-06-16 16:15:08 -07:00
Dmitri Plotnikov
bef9c7a59d Preventing cursor leaks when a query is interrupted
Re-ran runtest cts-os

Change-Id: I518a2a4f842b01d082078e16643aa377a4575237
2010-06-16 15:38:07 -07:00
Fabrice Di Meglio
9cf3dc480f Merge "Fix bug# 2772317 (CalendarDatabaseHelper internal cleanup)" 2010-06-16 15:35:31 -07:00