64423 Commits

Author SHA1 Message Date
Gilles Debunne
893eace609 Merge "Sub display list in TextView" 2012-01-13 14:53:54 -08:00
David 'Digit' Turner
d615f34b56 Merge "media/mtp: Add missing LOCAL_C_INCLUDES" 2012-01-13 14:32:50 -08:00
Stephen Hines
d36f7d2495 Merge "Add support for new root.expand() calls." 2012-01-13 13:57:24 -08:00
Glenn Kasten
1e80869133 Get AID_GRAPHICS from right place
Change-Id: I97b1754dc7260fec083275c71a8f71ebfb2cefa8
2012-01-13 13:45:39 -08:00
Kenny Root
fcbbaf1d83 resolved conflicts for merge of e80341c8 to master
Change-Id: I5d2150e20aebb6aba10caa391268c0fdbbf281ef
2012-01-13 13:39:28 -08:00
Kenny Root
e80341c8c5 am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
* commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30':
  Fix issue with selecting proper JNI libraries
2012-01-13 13:12:34 -08:00
Kenny Root
2ddf6ea6dc Merge "Fix issue with selecting proper JNI libraries" into ics-mr1 2012-01-13 13:11:02 -08:00
Dianne Hackborn
f88d1493aa am 10065177: am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '100651779fde99f7ae2a10719d688b51115f08e9':
  Fix issue #5823276: home repaints after full-screen app is exited
2012-01-13 13:01:48 -08:00
Dianne Hackborn
100651779f am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '2e282f35b009fe4c23daca35592dae2032641643':
  Fix issue #5823276: home repaints after full-screen app is exited
2012-01-13 12:58:45 -08:00
Dianne Hackborn
2e282f35b0 Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 2012-01-13 12:56:40 -08:00
Bart Sears
31cef1451e am bcce2a19: am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit 'bcce2a195390c3f5fc235c3fa551d3d725a7f88a':
  Update to latest version of Roboto
2012-01-13 12:37:53 -08:00
Bart Sears
bcce2a1953 am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit 'da7b7700d0f499ac9b0bac51365b3da235388ae6':
  Update to latest version of Roboto
2012-01-13 12:35:07 -08:00
Bart Sears
da7b7700d0 Merge "Update to latest version of Roboto" into ics-mr1 2012-01-13 12:32:43 -08:00
Christopher Tate
ecce05fac6 am 89620c5d: am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '89620c5d982858f590f3740169c9f69ee380be3e':
  Streamline package-installed handling by the Backup Manager
2012-01-13 12:18:55 -08:00
Romain Guy
60c6b082ea Merge "Remove unused parameter" 2012-01-13 12:13:52 -08:00
Romain Guy
44d79747b5 Remove unused parameter
Change-Id: I0896b2cdb9f1fa9c5e191e4ea425e22ac6f10f29
2012-01-13 12:12:09 -08:00
Christopher Tate
89620c5d98 am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '2cf18d28785fdd188641867503586627cb212302':
  Streamline package-installed handling by the Backup Manager
2012-01-13 12:08:09 -08:00
Christopher Tate
2cf18d2878 Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1 2012-01-13 11:49:20 -08:00
Bart Sears
6c16a58b2c Update to latest version of Roboto
Bug: 5527891

U+0125 (h with Circumflex):  Moved the Circumflex to not stick out
       beyond the left edge of the "h"
U+0300, U+0301, U+0303, U+0309, U+030F, U+0323: Move to the left so
       that they can be composited.
U+047C (Capital Omega with Titlo): Fixed the Titlo accent
U+047D (Small Omega with Titlo): Fixed the Titlo accent
U+048E (Capital ER with tick): Changed the tick to be diagonal
U+2248 (Almost equal to):  Added the glyph

Change-Id: Ibcadcd008a58f42d8bd4238d768101d8bf726ff6
2012-01-13 11:44:23 -08:00
John Huang
70f52e6d79 am e6572304: am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit 'e65723044d6ad7fb2ff1bb760100a3cf40c6c5f2':
  Fix teardown of secondary connections on CDMA
2012-01-13 11:41:01 -08:00
John Huang
e65723044d am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
  Fix teardown of secondary connections on CDMA
2012-01-13 11:39:03 -08:00
John Huang
2753e826b2 Merge "Fix teardown of secondary connections on CDMA" into ics-mr1 2012-01-13 11:37:15 -08:00
Jean-Baptiste Queru
134a683565 am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'c0ef548c748f0c3bc917eff7b50941f9cbe1df86':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2012-01-13 11:28:09 -08:00
Jean-Baptiste Queru
c0ef548c74 am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2012-01-13 11:25:09 -08:00
Jean-Baptiste Queru
d75961eecb am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2012-01-13 11:22:08 -08:00
Robert Ly
3e9aa56e56 am 7da0abc5: am 62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
* commit '7da0abc52e3cbdeeb7fae0d22895710254ef9ec4':
  cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
2012-01-13 11:20:43 -08:00
Robert Ly
7da0abc52e am 62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
* commit '62472581c30a3202b7bbd86e644b4346d5a4e65c':
  cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
2012-01-13 11:09:27 -08:00
Alon Albert
ade3289bee Merge "New command to request a sync" 2012-01-13 10:35:53 -08:00
Alon Albert
e1c4a0b31b New command to request a sync
Change-Id: I523e8ff4814940197d0b9a362a3920e69feae6fd
2012-01-13 10:19:24 -08:00
Robert Ly
62472581c3 Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1 2012-01-13 10:13:14 -08:00
Robert Ly
0272f1dfd7 cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
Change-Id: Iff4b4bd171818208bb3be46dd3ef7e91b6cbd80f
2012-01-13 10:07:20 -08:00
Jean-Baptiste Queru
b4cee0f871 Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2012-01-13 07:48:56 -08:00
David 'Digit' Turner
3203f2af94 media/mtp: Add missing LOCAL_C_INCLUDES
One of the source files here is including <cutils/tztime.h> which
itself includes <bionic_time.h>, a private C library header used
to define the strftime_tz() extension (which used to be declared
in <time.h> but was moved there instead).

Add a missing C include path to let our code compile as usual.

Change-Id: I6aac2f1d3d15ad182679c81ff3f4febff74eb671
2012-01-13 14:21:42 +01:00
Guang Zhu
6a78cd8586 Merge "Move where prop dev.bootcomplete is set" 2012-01-12 21:00:15 -08:00
Bart Sears
73f22cd430 Merge "Add glyphs for Vertical Text" 2012-01-12 19:20:05 -08:00
Stephen Hines
6b4cf07cab Add support for new root.expand() calls.
BUG=5444144

Change-Id: I9ab942561a03e9f837a3199457259bb3e07ac76f
2012-01-12 18:56:43 -08:00
Mathias Agopian
a8f75fe9a9 Merge "fix a bug with vsync management" 2012-01-12 18:49:07 -08:00
Ken Wakasa
5a5b84c3e1 Merge "Bring LatinIME's privateImeOptions "forceAscii" to a formal public API" 2012-01-12 18:15:42 -08:00
Guang Zhu
191713a51f Move where prop dev.bootcomplete is set
Currently test harnesses depends on this flag to determine when
the system is fully booted, and start dismissing keyguard, launch
tests etc. However, the flag is usually set when the boot animation
is still running, and typically about 5 seconds before keyguard is
up etc. Moving to to when BOOT_COMPLETE broadcast is sent makes it
work more reliable.

We also discussed about using sys.boot_completed instead,
unfortunately this flag is not in all platform and we still have
backwards compatibility to maintain in order to drive unbundled
tests.

Change-Id: I99b084cd70d8e4bcfe490ddeca868136d32712e2
2012-01-12 17:39:40 -08:00
Alon Albert
cf12902719 Merge "Log global autosync on dumpsys Protect dumpsys from divide by zero" 2012-01-12 17:39:37 -08:00
Robert Greenwalt
2fceb7fec0 Fix teardown of secondary connections on CDMA
Restores functionallity from Gingerbread.  We should tear down when the
enabledcount goes to zero, but we should always notify and attempt to
switch back to default when indicated.

bug:5830081
Change-Id: Ib8469bb5369da21e8cc05fb755b2d7e24c8e02a6
2012-01-12 17:38:54 -08:00
James Dong
b5c6ff5993 Merge "Separate sniffing from session initialization" 2012-01-12 16:56:58 -08:00
Adam Cohen
dc89357810 Merge "Getting rid of hack where the wallpaper offset was being deferred" 2012-01-12 16:47:00 -08:00
Ken Wakasa
c8f4183669 Bring LatinIME's privateImeOptions "forceAscii" to a formal public API
bug: 5850605
Change-Id: I6ab6076909c735a3e0729b457de68d0b5301184d
2012-01-13 09:45:41 +09:00
Bart Sears
4b45522304 Add glyphs for Vertical Text
Adds U+FE10-U+FE19, U+2022, U+25C9, U+FE45, U+FE46

Also has an updated version of U+59A9 (this is a bug fix
unrelated to the new Vertical Text glyphs).

This is the second drop from Monotype.  The first drop was
missing U+FE11 and U+FE13 and had a few other minor issues.

Bug: 5472953
Change-Id: I270ae3c88bf8ba227de58cdce7321464ca708308
2012-01-12 16:42:32 -08:00
James Dong
d1ba6ed945 Separate sniffing from session initialization
This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened

o The change is backward compatibile in that no update is required
  for existing drm plug-ins if they do not plan to provide separate
  sniffer/extractor

related-to-bug: 5725548

Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
2012-01-12 16:25:12 -08:00
Christopher Tate
0bacfd2ba6 Streamline package-installed handling by the Backup Manager
In particular, don't do O(asec_apps * installed_apps) work during the
broadcast receiver's operation.  On devices with many installed apps
and a large number of them moved to ASECs, this was causing the system
process to become unresponsive and the watchdog to fire -- which in turn
would initiate a restart loop, as the same package-installed broadcast
would then be issued again once the package manager rescanned the ASEC
containers, ad infinitum.  With this change, the expensive call to the
package manager is only made once rather than asec_apps times.

Bug 5850283

Change-Id: I14e280ea1fa6af19cebc58869a20fbb599c92c8c
2012-01-12 16:15:09 -08:00
Mathias Agopian
87c6ea6eed fix a bug with vsync management
this bug was introduced recently. we were signaling *all* clients
regardless of the vsync rate.

Change-Id: I2ae8a6c820a390f602382596ba75e8ed737fb2ef
2012-01-12 16:13:54 -08:00
Gilles Debunne
b35ab7b729 Sub display list in TextView
TextView uses a sub-display list to 'cache' the rendering of its
text. This saves time when drawing an editable text, where the blinking
cursor forces a re-draw twice per second, which creates pauses during
scrolling.

Added a sub-display list invalidation when an appearance span is
modified/added/removed.

Also added an invalidation of the display list when selection range
is changed.

Change-Id: I41e8068a12902b8a745c5bb77de8c77def76a270
2012-01-12 15:56:37 -08:00
Scott Main
c8ac86ba6b am cea3892b: am 722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1
* commit 'cea3892bd7fdf605d51a7f99aa0d20dfbea80dd3':
  docs: make AD logo clickable on home page
2012-01-12 15:49:34 -08:00