25852 Commits

Author SHA1 Message Date
The Android Open Source Project
d3844bcfb0 merge from froyo-plus-aosp
Change-Id: I9bd45d66c9586b99635d7d05d1f351126bfc9840
2010-06-25 11:21:37 -07:00
The Android Open Source Project
7e343b8d39 merge from froyo-plus-aosp
Change-Id: Ic1d0535cb746af0c53a5277b008061f7a2d973a2
2010-06-25 11:20:45 -07:00
The Android Open Source Project
f29fbc58ec merge from froyo-plus-aosp
Change-Id: Ibaa84571e3b5a7ea29e55d41f773aa5f301086de
2010-06-25 11:18:59 -07:00
Vasu Nori
96d35d5bef Merge "remove some not-so-useful-logging" 2010-06-25 11:16:28 -07:00
Vasu Nori
6188c2746d remove some not-so-useful-logging
the sql statement is already printed if SqlStatements is set to VERBOSE
anyway. so no need for this extra logging
Change-Id: Id0e6c5acbbbd453ea45f08bcb802213bc22896fc
2010-06-25 11:10:54 -07:00
Cary Clark
924af70019 Refactor find and select dialogs
In WebView:
- Remove the select mode, so that while text is selected,
the view may respond to scroll or zoom gestures.
- Remove the getFindIsUp() method -- let the host application
track if the dialog is visible.
- Map long press to select text if the host application does
not already intercept it.
- Draw find 'extras' during zoom animation.
- Draw select 'extras' during animation and scrolling as well.
- Distinguish between selecting text and pressing a shift key
(the shift key is still a possible select text shortcut)
- Add more public (but hidden) interfaces: setUpSelect, selectAll, etc.

In WebChromeClient, add interfaces to allow WebView to tell the host
application that selection has started or finished. A long press on
a part of the view that does not trigger a host context menu may
start the selection (if text is underneath the press), and clicking
the trackball or tapping away from the current selection may
end the selection.

Companion changes in external/webkit and packages/apps/Browser

Change-Id: I81f549181249c38d8d4c10fd7064f513d11318fa
http://b/262451
2010-06-25 14:08:56 -04:00
Andreas Huber
330dd304a4 Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
This reverts commit 081bc5c47d8a980e6eafa70ddafcd89981586391.
2010-06-25 11:05:37 -07:00
Andreas Huber
75fb44b234 am 357f8209: Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread
Merge commit '357f8209f3aec63fa2779da4eeab8825f80b0a41' into gingerbread-plus-aosp

* commit '357f8209f3aec63fa2779da4eeab8825f80b0a41':
  Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers
2010-06-25 11:05:30 -07:00
Andreas Huber
357f8209f3 Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread 2010-06-25 11:03:42 -07:00
James Dong
bc704dddb6 am 6feaa464: Enable passing parameters to the MediaWriter at runtime (at start() call).
Merge commit '6feaa46496bae85adbe10e84611592612f898081' into gingerbread-plus-aosp

* commit '6feaa46496bae85adbe10e84611592612f898081':
  Enable passing parameters to the MediaWriter at runtime (at start() call).
2010-06-25 10:57:12 -07:00
The Android Open Source Project
3b335078e8 ignore from froyo-plus-aosp
Change-Id: I8144bf5c270b95c06252e7195b7cc2bc91452849
2010-06-25 10:51:16 -07:00
Andreas Huber
909a8cf62c Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers
Change-Id: Iaedfb5645e3052a63789244c90900573f8449bac
2010-06-25 10:44:24 -07:00
James Dong
6feaa46496 Enable passing parameters to the MediaWriter at runtime (at start() call).
- estimate the moov box size for mp4 file writer based on the file
  size/duration limit and target bit rate.
- can switch to use 64 bit file offset at runtime

rebased

Change-Id: Ibbe1f57e91ab2605820d5d96e8048d11e5559c53
2010-06-25 10:24:35 -07:00
Irfan Sheriff
96e6bdb033 Add obtainMessage functions to HSM
Change-Id: Idc907f429cf15e61ad461af95fdc245fd5aca23f
2010-06-25 10:13:29 -07:00
James Dong
d115304c09 am 5a905ceb: Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread
Merge commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13' into gingerbread-plus-aosp

* commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13':
  Track maximum amplitude and fix getMaxAmplitude()
2010-06-25 09:47:51 -07:00
James Dong
5a905ceb06 Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread 2010-06-25 09:43:14 -07:00
Alex Sakhartchouk
5b7e333cf2 Merge "Adding freetype font rendering to renderscript." 2010-06-25 09:24:19 -07:00
Jeff Hamilton
c086d9403f Revert "am 256fc043: am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
This reverts commit e02dec8c4cbab17d09983af1328308b8aa61ef85, reversing
changes made to 6d7a052fb04b251c517d0a9049b8d5d7408ce8c0.

Bug: 2798567
2010-06-25 10:48:08 -05:00
Mathias Agopian
e02dec8c4c am 256fc043: am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Merge commit '256fc04394431cbd332e56747fdbfda4cb4c2e25'

* commit '256fc04394431cbd332e56747fdbfda4cb4c2e25':
  fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
2010-06-25 08:30:06 -07:00
Daniel Sandler
6d7a052fb0 am b9353372: am 8896783d: Updated StatusBar test app for new notifications API.
Merge commit 'b9353372f67dcb18bccb26165758a47cfe3197de'

* commit 'b9353372f67dcb18bccb26165758a47cfe3197de':
  Updated StatusBar test app for new notifications API.
2010-06-25 08:30:02 -07:00
Daniel Sandler
ddac8829b4 am bc4bc709: am 87160757: Basic handling of Notifications with fullScreenIntent.
Merge commit 'bc4bc709a819801a23aa604896ae2457ae710bec'

* commit 'bc4bc709a819801a23aa604896ae2457ae710bec':
  Basic handling of Notifications with fullScreenIntent.
2010-06-25 08:29:56 -07:00
Derek Sollenberger
94345f45e7 Fix zoom overview mode bug in the zoom manager.
Change-Id: Ia4c95e8014976ff6a1c5f3b19030abd78b532f96
http://b/2793303
2010-06-25 10:45:04 -04:00
Derek Sollenberger
a559e8b62e Merge "fix NullPointerException caused by inflating XML Webview that is defined to be non-visible." 2010-06-25 04:28:50 -07:00
Steve Block
71afcc5f2c Merge "Fixes a few minor problems with AAPT" 2010-06-25 03:03:59 -07:00
Steve Block
f1ff21ac62 Fixes a few minor problems with AAPT
- Fixes casting problems with stricter compilers
- Adds a couple of missing ifdef guards

This is a first step toward being able to generate APKs on the fly on the device.

Bug: 2766918
Change-Id: Icaaee5a4032afa313256add321b447443861dd85
2010-06-25 11:02:15 +01:00
James Dong
57e7f83c03 Track maximum amplitude and fix getMaxAmplitude()
- only start to track the max amplitude after the first call to getMaxAmplitude()

Change-Id: I64d3d9ca0542202a8535a211425e8bccceca50fc
2010-06-24 21:59:25 -07:00
Mathias Agopian
51a6aef53c Fix a bug in sp<> and wp<> which could cause memory corruptions
when assigning a smart pointer to another one, we need to make
sure to read all the data we need from the right-hand-side
reference (the assignee) before we decRef the assigned.

This bug would cause linked-list of smart-pointers to fail
miserably.

Change-Id: Ibb554c15fddf909f7737c632b7c80322e80ea93f
2010-06-24 21:49:02 -07:00
Mathias Agopian
256fc04394 am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Merge commit '081bc5c47d8a980e6eafa70ddafcd89981586391' into gingerbread-plus-aosp

* commit '081bc5c47d8a980e6eafa70ddafcd89981586391':
  fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
2010-06-24 21:36:37 -07:00
Mathias Agopian
081bc5c47d fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.

Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
2010-06-24 21:28:59 -07:00
Irfan Sheriff
17b232b5b5 Add setWifiApConfiguration interface
Bug: 2538623
Change-Id: I779044173a2fa0e9b851ea92aeec5ca25eb9c86f
2010-06-24 20:03:38 -07:00
Romain Guy
ca9d544e38 Merge "Add colored rectangles implementation in OpenGLRenderer." 2010-06-24 19:32:44 -07:00
Romain Guy
9d5316e3f5 Add colored rectangles implementation in OpenGLRenderer.
Drawing two rectangles one after the other discards the second one because of
Z buffering issues. This will be fixed in another changelist.

Change-Id: Ida1b3cde8a78e60cacc07e477abc44def527ff67
2010-06-24 19:30:36 -07:00
Daniel Sandler
b9353372f6 am 8896783d: Updated StatusBar test app for new notifications API.
Merge commit '8896783dc1d31c5274b277c364da0ffe7cc27cca' into gingerbread-plus-aosp

* commit '8896783dc1d31c5274b277c364da0ffe7cc27cca':
  Updated StatusBar test app for new notifications API.
2010-06-24 19:13:25 -07:00
Daniel Sandler
bc4bc709a8 am 87160757: Basic handling of Notifications with fullScreenIntent.
Merge commit '87160757e827e8e158d233de09d70e7128184729' into gingerbread-plus-aosp

* commit '87160757e827e8e158d233de09d70e7128184729':
  Basic handling of Notifications with fullScreenIntent.
2010-06-24 19:13:22 -07:00
Daniel Sandler
8896783dc1 Updated StatusBar test app for new notifications API.
New actions:
 - Toggle activity's immersive mode
 - Post a priority notification with fullScreenIntent
   that launches an alert-like activity

Change-Id: Ie38372209985577b6db856924c19914c000e1cec
2010-06-24 22:09:35 -04:00
Daniel Sandler
87160757e8 Basic handling of Notifications with fullScreenIntent.
If a Notification has a non-null fullScreenIntent AND the
topmost Activity is not immersive, that PendingIntent will
fire (presumably causing a nice dialog or full-screen
activity to appear).

Immersive mode handling for FLAG_HIGH_PRIORITY Notifications
is still unimplemented (although the fullScreenIntent will
be suppressed in immersive mode).

Note that currently your fullScreenIntent notification will
also get posted to the status bar, so you're responsible for
clearing it out (e.g. in onPause in your alert intent). See
forthcoming changes to StatusBarTest for an example.

Change-Id: Ie750d1b7bcc788bd29ee1d8626f971dd47fd2817
2010-06-24 22:09:35 -04:00
Scott Main
06f36212d6 am 8ab65289: am 7dacda11: am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '8ab652896394526d8793973067b228eca34201a7'

* commit '8ab652896394526d8793973067b228eca34201a7':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:18:28 -07:00
Scott Main
8ab6528963 am 7dacda11: am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '7dacda1142379df1f1f9854c24e452acdea98436' into gingerbread-plus-aosp

* commit '7dacda1142379df1f1f9854c24e452acdea98436':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:16:31 -07:00
Scott Main
da3b02c6bc am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into froyo-plus-aosp

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:14:06 -07:00
Scott Main
7dacda1142 am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into gingerbread

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:12:49 -07:00
Scott Main
56c778e6cf Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo 2010-06-24 18:10:41 -07:00
Jason Sams
ad02a9b64f Merge "Fix return values for rsClamp." 2010-06-24 17:57:18 -07:00
Jason Sams
6495128049 Fix return values for rsClamp.
Change-Id: Ic9980a2304797a74392c729d6b8ec9f477a906d6
2010-06-24 17:56:34 -07:00
Joe Onorato
ab3c7d2a8c am 0bf5cce9: am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread
Merge commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c'

* commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c':
  Fix the notification vibration setting and add a test app that lets you recover from the busted
2010-06-24 17:55:59 -07:00
Joe Onorato
0bf5cce9ee am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread
Merge commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9' into gingerbread-plus-aosp

* commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9':
  Fix the notification vibration setting and add a test app that lets you recover from the busted
2010-06-24 17:53:28 -07:00
Joe Onorato
0a0edccafb Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread 2010-06-24 17:51:22 -07:00
Joe Onorato
8932020f54 Fix the notification vibration setting and add a test app that lets you recover from the busted
state.

Bug: 2767349
Change-Id: Id0c41734e82a1256a49175a2dc6b40f0abaf4f8b
2010-06-24 17:49:44 -07:00
Dianne Hackborn
8bb998d52c am ea8eafad: am 2529a453: Merge "Make bad notifications crash their application." into gingerbread
Merge commit 'ea8eafad4f5438ec1291d45376959a996d36e15e'

* commit 'ea8eafad4f5438ec1291d45376959a996d36e15e':
  Make bad notifications crash their application.
2010-06-24 17:33:14 -07:00
Dianne Hackborn
ea8eafad4f am 2529a453: Merge "Make bad notifications crash their application." into gingerbread
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp

* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
  Make bad notifications crash their application.
2010-06-24 17:30:42 -07:00
Scott Main
654d9414de docs: Remove the TOS from download flow and remove TOS entirely because
it's no longer relevant to the SDK download package

Change-Id: I5f0b2b6258db1f09f300567fc0d22b5e3effd324
2010-06-24 17:29:13 -07:00