Commit Graph

37377 Commits

Author SHA1 Message Date
Mike Lockwood
1e2ac3ced7 Merge "UsbManager: add getDefaultFunction()" 2011-08-02 10:01:53 -07:00
Gloria Wang
59462e25b8 Merge "Re-calculate mCurrentTimeUs for MP3 CBR seek because we might have called Resync() which changes mCurrentPos. For bug 4869063." 2011-08-02 09:56:51 -07:00
Gloria Wang
f5417d53e8 Merge "Fix ordering assumption of argument evaluation." 2011-08-02 09:22:05 -07:00
Gloria Wang
4d432b0bb2 Merge "Fix ordering assumption of argument evaluation." 2011-08-02 09:21:53 -07:00
Yu Shan Emily Lau
37b8984d78 Merge "Replace the hard coded video recording properties with media profile." 2011-08-02 08:39:01 -07:00
Justin Ho
27f134d248 Merge "Updated btn_default and btn_toggle assets Bug: 5076695" 2011-08-02 07:27:38 -07:00
Justin Ho
c392872db4 Merge "Updated scrollbars and fast scroller assets. Bug: 5076695" 2011-08-02 07:27:22 -07:00
Justin Ho
d35d6554c8 Merge "Updated progress bar and scrubbers, adding xhdpi Bug: 5076695" 2011-08-02 07:27:12 -07:00
Justin Ho
9425554908 Merge "Updated spinners Bug: 5076695" 2011-08-02 07:27:03 -07:00
Daniel Sandler
c3799272d4 Merge "Refresh tablet notification drawer." 2011-08-02 04:39:46 -07:00
Daniel Sandler
d55cf5be99 Merge "Merging ongoing + latest notifications on phone UI to match tablets." 2011-08-02 04:39:35 -07:00
Wu-cheng Li
d93f941b4e Merge "Add camera recording hint parameter." 2011-08-02 00:16:28 -07:00
satok
4d68430af4 Merge "Move SpellCheckerSession" 2011-08-02 00:11:06 -07:00
Shih-wei Liao
a9d018f97a Merge "Finish the refactor work of bccPrepareExecutable" 2011-08-01 23:26:39 -07:00
Mathias Agopian
c7d14e2471 Add a h/w composer API to allow the HAL to trigger a redraw
This is useful in various situations, for instance if the HAL
wants to change its compositing strategy.

Bug: 4488017
Change-Id: I5afc14e5917c6db7926d7417d48677d5aba50caa
2011-08-01 20:48:05 -07:00
satok
ba2f168c1c Merge "Add a method to set the current spell checker" 2011-08-01 19:49:37 -07:00
Dianne Hackborn
f914dce14c Merge "Move ImageWallpaper to SystemUI process." 2011-08-01 18:59:58 -07:00
Romain Guy
05f8263fbe Merge "Reduce the amount of data cached by the gradients cache." 2011-08-01 18:57:43 -07:00
Adam Powell
20c286de4d Merge "Fix bug 5105394 - Get rid of btn_default_small" 2011-08-01 18:31:40 -07:00
Jeff Brown
ecc0e1014f Merge "Refactor input reader to add stylus support. Bug: 5064702" 2011-08-01 17:48:21 -07:00
Romain Guy
6f12148de0 Merge "Allow Canvas.setBitmap() to receive a null Bitmap." 2011-08-01 17:42:36 -07:00
Adam Powell
09f7227053 Merge "Fix bug 5090996 - Crash on tapping Menu on dial pad" 2011-08-01 17:20:06 -07:00
Mathias Agopian
d05b34a079 Merge "connect/disconnect is now called from our EGL wrapper" 2011-08-01 16:36:02 -07:00
Jeff Sharkey
d8501af363 Merge "Add operation counts to network statistics." 2011-08-01 16:33:50 -07:00
Romain Guy
bd7b3a3d87 Merge "Use high precision iterators on specific GPUs Bug #5098359" 2011-08-01 15:29:56 -07:00
Brett Chabot
9e5fbc0fc8 Merge "Add functional test for screenshots." 2011-08-01 15:07:01 -07:00
Jean-Baptiste Queru
880c6378ff am 8fb7bd4d: am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '8fb7bd4d02cd4ad2111699778e64464d979f03bb':
  Stagefright: Return error if codec takes too long to return a buffer.
2011-08-01 14:12:43 -07:00
Jean-Baptiste Queru
2f7b9bf2d1 am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '5bb3129c7eabce34d7c1469826e1795d4b225bb3':
  Stagefright: Return error if codec takes too long to return a buffer.
2011-08-01 14:10:39 -07:00
Chia-chi Yeh
d01002ef74 Merge "Revert "Unhide APIs for user space VPN."" 2011-08-01 14:09:58 -07:00
Mathias Agopian
81a6335052 connect/disconnect is now called from our EGL wrapper
the original connect/disconnect hooks are deprecated
and replace by api_connect/api_disconnect. the original
hooks are no no-ops.
api_connect/api_disconnect is now only called from the
android framework.

Bug: 5057915
Change-Id: I8ca64cd1acd6cabf915bf54689ec2e5f6dfa495a
2011-08-01 14:06:20 -07:00
Romain Guy
73c954fdff Merge "Plug memory leak in EditText." 2011-08-01 14:02:54 -07:00
Jean-Baptiste Queru
0581cb2681 am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit 'a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
  Stagefright: Return error if codec takes too long to return a buffer.
2011-08-01 13:59:02 -07:00
Jean-Baptiste Queru
46b0fc9b2d am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '5e57c2cf83ef62e9887592b46a4c3352662fb988':
  Stagefright: Return error if codec takes too long to return a buffer.
2011-08-01 13:55:45 -07:00
Jean-Baptiste Queru
ae182598a2 Merge "Stagefright: Return error if codec takes too long to return a buffer." 2011-08-01 13:43:07 -07:00
Jamie Gennis
05ca9998cd Merge "SurfaceFlinger: use async mode for video & cam" 2011-08-01 13:40:29 -07:00
Bjorn Bringert
1ea2dd4bcc Merge "Fix exception when a focused item is detached." 2011-08-01 13:39:30 -07:00
Andreas Huber
23d8c30741 Merge "Fix NALU extraction of unit starts with a 0x00 nalType" 2011-08-01 13:26:11 -07:00
Jamie Gennis
35770345e4 Merge "SurfaceTexture: allow set_buffer_count(2)" 2011-08-01 13:25:03 -07:00
Romain Guy
e346719a8f Merge "Fixing initialization cleanup in activity instrumentation test case" 2011-08-01 13:21:31 -07:00
Dianne Hackborn
822c0b022e Merge "Hide permissions that are not available to apps." 2011-08-01 12:23:47 -07:00
Mathias Agopian
961d594575 Merge "improve GraphicAllocator dump method" 2011-08-01 12:15:07 -07:00
Jeff Brown
3a95b56682 Merge "Tweak hover for better accessibility and compatibility. Bug: 5087943" 2011-08-01 12:14:24 -07:00
Jamie Gennis
1ad0da83fd Merge "SurfaceFlinger: abandon Layer SurfaceTextures" 2011-08-01 12:10:47 -07:00
Eric Fischer
37363f858a am 72b7a7d9: (-s ours) am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '72b7a7d90b631a703681751c02f1447e3c75ccb0':
  Import revised translations.  DO NOT MERGE
2011-08-01 11:23:08 -07:00
Eric Fischer
45923cdc11 am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'f01b3cfa9ac2869e3762a90917569186039a9665':
  Import revised translations.  DO NOT MERGE
2011-08-01 11:19:59 -07:00
Eric Fischer
c1cf37d145 am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
  Import revised translations.  DO NOT MERGE
2011-08-01 11:17:17 -07:00
Eric Fischer
061ad637f7 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-08-01 11:15:58 -07:00
Andreas Huber
290fa96983 Merge "Start playing live streaming HLS content from the first segment." 2011-08-01 10:46:51 -07:00
Matthew Xie
78dede3618 Merge "Change setDevicePropertyNative to no block." 2011-08-01 10:20:30 -07:00
Luca Zanolin
13e0e40ecd Merge "Sort the suggestions based based on the length of the text they are attached too." 2011-08-01 09:51:29 -07:00