25690 Commits

Author SHA1 Message Date
Steve Block
3d9bdc3979 Merge "Add a splash screen to the webruntime." 2010-06-24 10:47:15 -07:00
Ben Murdoch
b5c49c8bb1 Add a splash screen to the webruntime.
Bug: 2766920
Change-Id: Ie40627aa50e849b49177f79aa129242eb1d2f2a8
2010-06-24 18:45:34 +01:00
Mike Lockwood
57c798ade1 Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
We now broadcast Usb.ACTION_USB_CONNECTED and Usb.ACTION_USB_DISCONNECTED
when USB is connected or disconnected.
The ACTION_USB_CONNECTED extras indicate the enabled/disabled state of
all USB functions.

Change-Id: I919fcd5aa8d640d051cec87053f474a9843ed545
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-24 13:14:05 -04:00
James Dong
b6ecd6c923 am 40d9f010: am 7fd22aab: Merge "Fixed the software AAC encoder" into gingerbread
Merge commit '40d9f0105f0a8f484724619154b18c5d85589eff'

* commit '40d9f0105f0a8f484724619154b18c5d85589eff':
  Fixed the software AAC encoder
2010-06-24 09:50:11 -07:00
James Dong
40d9f0105f am 7fd22aab: Merge "Fixed the software AAC encoder" into gingerbread
Merge commit '7fd22aab4506f65b7929ed1030bdd71c56f7db77' into gingerbread-plus-aosp

* commit '7fd22aab4506f65b7929ed1030bdd71c56f7db77':
  Fixed the software AAC encoder
2010-06-24 09:48:33 -07:00
James Dong
7fd22aab45 Merge "Fixed the software AAC encoder" into gingerbread 2010-06-24 09:46:48 -07:00
Mike Lockwood
d629abd097 am 5da347dd: (-s ours) am 477def1d: Merge changes I11495d03,If5816721 into gingerbread
Merge commit '5da347dd2dc7de8828077057f4963b904018c5ec'

* commit '5da347dd2dc7de8828077057f4963b904018c5ec':
  Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
  DO NOT MERGE Add new permission to allow access to USB devices
2010-06-24 09:31:45 -07:00
Mike Lockwood
5da347dd2d am 477def1d: Merge changes I11495d03,If5816721 into gingerbread
Merge commit '477def1d4216f82bdfe58525131db88b384fc5a5' into gingerbread-plus-aosp

* commit '477def1d4216f82bdfe58525131db88b384fc5a5':
  Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
  DO NOT MERGE Add new permission to allow access to USB devices
2010-06-24 09:28:59 -07:00
Mike Lockwood
477def1d42 Merge changes I11495d03,If5816721 into gingerbread
* changes:
  Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
  DO NOT MERGE Add new permission to allow access to USB devices
2010-06-24 09:26:55 -07:00
Andreas Huber
15149f2ef8 am 0d964c94: am a2549bb6: Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread
Merge commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd'

* commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd':
  Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
2010-06-24 09:08:21 -07:00
Andreas Huber
0d964c9445 am a2549bb6: Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread
Merge commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9' into gingerbread-plus-aosp

* commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9':
  Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
2010-06-24 09:06:49 -07:00
Andreas Huber
a2549bb644 Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread 2010-06-24 09:05:08 -07:00
Mike Lockwood
2423607a32 Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
We now broadcast Usb.ACTION_USB_CONNECTED and Usb.ACTION_USB_DISCONNECTED
when USB is connected or disconnected.
The ACTION_USB_CONNECTED extras indicate the enabled/disabled state of
all USB functions.

Change-Id: I11495d039429dbe22bd738067296e39ae415befa
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-24 09:36:50 -04:00
Mike Lockwood
9163d42a50 DO NOT MERGE Add new permission to allow access to USB devices
Adds permission android.permission.ACCESS_USB.
This is a partial cherry pick of a change from master.
It adds the permission, but not the support for associating it
the AID_USB group.

Change-Id: If5816721a4fc88bf444141a7b717da65ea37d5f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-24 09:36:35 -04:00
Steve Block
abe9e69c45 Merge "Fixes use of permission string in WebRuntimeActivity" 2010-06-24 06:16:15 -07:00
Steve Block
c9eecb274b Fixes use of permission string in WebRuntimeActivity
Bug: 2766920
Change-Id: I01bc02c99808b31efa34e33754905091b9370b3a
2010-06-24 10:36:22 +01:00
Joe Onorato
a18dbdf420 am 801b63d3: am 51e895f0: Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread
Merge commit '801b63d3b865054b3015e2cf315ca7c9386d1212'

* commit '801b63d3b865054b3015e2cf315ca7c9386d1212':
  Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
2010-06-23 17:50:42 -07:00
Romain Guy
038ecb097a Merge "Add support for transformations." 2010-06-23 17:50:02 -07:00
Joe Onorato
801b63d3b8 am 51e895f0: Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread
Merge commit '51e895f055f76ad0114a18e1b754a1475a62c524' into gingerbread-plus-aosp

* commit '51e895f055f76ad0114a18e1b754a1475a62c524':
  Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
2010-06-23 17:48:18 -07:00
Romain Guy
f6a11b8a9e Add support for transformations.
This change adds partial support for the following transforms:
- scale()
- translate()
- rotate()
- setMatrix()
- getMatrix()

The transform is stored in a snapshot and saved/restored as needed.
The transform is currently not applied to the clip rect and is not
mapped to the vertex shader.

Change-Id: Id48993453311200804149917d0c126a4d0471226
2010-06-23 17:47:49 -07:00
Joe Onorato
51e895f055 Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread 2010-06-23 17:46:46 -07:00
Joe Onorato
c27bb55980 Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
changed.

Bug: 2772728
Change-Id: I9e230fbe42d01cfc953cdafb86dd0d616d96a3ea
2010-06-23 17:44:30 -07:00
James Dong
438e4f62ad Fixed the software AAC encoder
Make sure that each input frame contains at least 1024 samples, as
required by the AAC encoder, and fix the incorrect timestamp.

Change-Id: I344cafe8c89be51d6e64552fab70539990ff6049
2010-06-23 17:12:11 -07:00
Christopher Tate
a6e2e01f75 am bc0793e4: am 03791188: Merge "Remember to initialize timestamps in the dispatch allocator" into gingerbread
Merge commit 'bc0793e4b77f1f8ec30294a4edac67dfca81f31d'

* commit 'bc0793e4b77f1f8ec30294a4edac67dfca81f31d':
  Remember to initialize timestamps in the dispatch allocator
2010-06-23 16:57:28 -07:00
Christopher Tate
bc0793e4b7 am 03791188: Merge "Remember to initialize timestamps in the dispatch allocator" into gingerbread
Merge commit '0379118827ef7e81a70e88e5910f5c7536d8b945' into gingerbread-plus-aosp

* commit '0379118827ef7e81a70e88e5910f5c7536d8b945':
  Remember to initialize timestamps in the dispatch allocator
2010-06-23 16:55:07 -07:00
Christopher Tate
0379118827 Merge "Remember to initialize timestamps in the dispatch allocator" into gingerbread 2010-06-23 16:52:37 -07:00
Christopher Tate
e91a5db35b Remember to initialize timestamps in the dispatch allocator
Change-Id: I83a2d353c34ff84a7d130e602c6dedc6a5541944
2010-06-23 16:51:07 -07:00
Andreas Huber
8d65dd2653 Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce
related-to-bug: 2370115
2010-06-23 16:40:57 -07:00
Joe Onorato
5d8faa280a am 2d8e2498: am 4ca092c7: Merge "Fix bug 2772728 with the suggested fix. I wasn\'t able to reproduce it though." into gingerbread
Merge commit '2d8e249854d134f87423646cc96d1cd9507a67b0'

* commit '2d8e249854d134f87423646cc96d1cd9507a67b0':
  Fix bug 2772728 with the suggested fix.  I wasn't able to reproduce it though.
2010-06-23 16:11:50 -07:00
Joe Onorato
2d8e249854 am 4ca092c7: Merge "Fix bug 2772728 with the suggested fix. I wasn\'t able to reproduce it though." into gingerbread
Merge commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad' into gingerbread-plus-aosp

* commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad':
  Fix bug 2772728 with the suggested fix.  I wasn't able to reproduce it though.
2010-06-23 16:10:01 -07:00
Joe Onorato
4ca092c7f1 Merge "Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though." into gingerbread 2010-06-23 16:08:06 -07:00
James Dong
7d77a0ac89 am 90ade3f2: am 9afc1b3e: Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread
Merge commit '90ade3f25d16afe8fd64ec1fcc5fede466256719'

* commit '90ade3f25d16afe8fd64ec1fcc5fede466256719':
  Fixed some meta data issues in the recorded mp4 file
2010-06-23 15:18:45 -07:00
James Dong
90ade3f25d am 9afc1b3e: Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread
Merge commit '9afc1b3ed3eb8dbfb440600495d92def88934f54' into gingerbread-plus-aosp

* commit '9afc1b3ed3eb8dbfb440600495d92def88934f54':
  Fixed some meta data issues in the recorded mp4 file
2010-06-23 15:16:25 -07:00
James Dong
9afc1b3ed3 Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread 2010-06-23 15:13:55 -07:00
Dianne Hackborn
f92f8686f9 am 98f7aed6: am 1e4b9f39: Remove InputConsumer, replacing with InputQueue.
Merge commit '98f7aed66b54c365f816fe990de978f61155cde1'

* commit '98f7aed66b54c365f816fe990de978f61155cde1':
  Remove InputConsumer, replacing with InputQueue.
2010-06-23 14:43:31 -07:00
Dianne Hackborn
98f7aed66b am 1e4b9f39: Remove InputConsumer, replacing with InputQueue.
Merge commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440' into gingerbread-plus-aosp

* commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440':
  Remove InputConsumer, replacing with InputQueue.
2010-06-23 14:40:36 -07:00
Dianne Hackborn
1e4b9f3936 Remove InputConsumer, replacing with InputQueue.
Change-Id: Ib06907278457aaee842b123adc072840ca3602d8
2010-06-23 14:37:30 -07:00
Shimeng (Simon) Wang
da91bf5c13 Merge "Tweak fix for setXSSAuditorEnabled in LayoutTestController." 2010-06-23 14:15:20 -07:00
Elliott Slaughter
be1304f0c2 Tweak fix for setXSSAuditorEnabled in LayoutTestController.
Change-Id: Iba9b67da8628e3880e8f6b18d2dc51337b9c58fb
2010-06-23 14:11:37 -07:00
James Dong
39a0b21c65 Fixed some meta data issues in the recorded mp4 file
- Mainly correcting the location of stbl box which should be a child of minf box.
  This resolved the issue where the mis-muxed encoded file could not be played by QT/VLC.

- Enabled the the recorded tracks by setting the flags to 0x07 by default

- Allows for encoding either 32-bit or 64-bit offsets. By default encoding
  32-bit offsets to reduce the metadata overhead

- Fixed a edts box issue where an empty elst box was used at the end

Change-Id: I570621a26714a81dc9400271aa5d3a07b483172f
2010-06-23 14:09:18 -07:00
Daniel Sandler
4ecdad302f am c82b4e80: am 69a4817e: Immersive activity API.
Merge commit 'c82b4e80b8211851963929b33592bbc50358525b'

* commit 'c82b4e80b8211851963929b33592bbc50358525b':
  Immersive activity API.
2010-06-23 13:37:59 -07:00
Daniel Sandler
c82b4e80b8 am 69a4817e: Immersive activity API.
Merge commit '69a4817e3e1e368e758ff8c238deb5ee26963c04' into gingerbread-plus-aosp

* commit '69a4817e3e1e368e758ff8c238deb5ee26963c04':
  Immersive activity API.
2010-06-23 13:36:25 -07:00
Daniel Sandler
69a4817e3e Immersive activity API.
An Activity can declare itself to be "immersive" either by
setting android:immersive="true" in AndroidManifest or by
calling setImmersive(true).

Immersive activities "should" not be interrupted, for
example by Notifications with an associated
fullScreenIntent. (In the future we may even prevent any
non-system application from successfully calling
startActivity() if the foreground activity is immersive.)
Notifications with FLAG_HIGH_PRIORITY set will be shown to
the user in some less-obtrusive way if the frontmost
activity is immersive.

Change-Id: I8d0c25cc4e22371c27cbf2bb6372d2c95d57b2d7
2010-06-23 16:29:36 -04:00
Mike Lockwood
c0b14c73fe am e4963260: am efbe2d78: Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread
Merge commit 'e496326083450e8623268ed794176d980f99eb0c'

* commit 'e496326083450e8623268ed794176d980f99eb0c':
  andriod.location.Criteria: Simplify new location criteria APIs a bit.
2010-06-23 13:23:28 -07:00
Andreas Huber
230f5c1cfb am 03e90f7e: am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
Merge commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97'

* commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97':
  Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
2010-06-23 13:23:24 -07:00
Mike Lockwood
e496326083 am efbe2d78: Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread
Merge commit 'efbe2d78ee5e26b6606c8552a5c1ac70749a5013' into gingerbread-plus-aosp

* commit 'efbe2d78ee5e26b6606c8552a5c1ac70749a5013':
  andriod.location.Criteria: Simplify new location criteria APIs a bit.
2010-06-23 13:20:20 -07:00
Andreas Huber
03e90f7eeb am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
Merge commit '58e9402b12218ca498ea3b932e16819612b1ea87' into gingerbread-plus-aosp

* commit '58e9402b12218ca498ea3b932e16819612b1ea87':
  Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
2010-06-23 13:20:15 -07:00
Mike Lockwood
efbe2d78ee Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread 2010-06-23 13:14:47 -07:00
Andreas Huber
58e9402b12 Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread 2010-06-23 13:14:16 -07:00
Andreas Huber
565879dc86 am 800af390: am b64af9a2: Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
Merge commit '800af39038dcded12b66eccb8932a761e20b1976'

* commit '800af39038dcded12b66eccb8932a761e20b1976':
  Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
2010-06-23 13:12:16 -07:00