101297 Commits

Author SHA1 Message Date
Scott Main
fb3819e914 am 35cd94ab: am 4539955e: am 8f03a47e: am 464deaba: am 3383c015: am 9d167eaa: docs: another string change for developer console bug: 8033647
* commit '35cd94ab97ac95401bafef8237d74e91d81ef08d':
  docs: another string change for developer console bug: 8033647
2013-02-27 23:22:53 +00:00
Ian Rogers
0664d95090 am 0493d799: am 75dcb333: am 545464df: Merge "Deprecate and document memory allocation counting."
* commit '0493d7997e22376524d707e407662d0f98f40c47':
  Deprecate and document memory allocation counting.
2013-02-27 23:22:44 +00:00
Ben Murdoch
9b4f09348e am 0e2f22a4: Merge "Update WebView#PictureListener for JBMR2." into jb-mr2-dev
* commit '0e2f22a42bc91db814591164b8a2cfc3d5a5cdbc':
  Update WebView#PictureListener for JBMR2.
2013-02-27 23:22:31 +00:00
Romain Guy
6a7cac6af9 am d9731a57: am bf53be46: am 09353f74: Merge "Check and fail early if requested wallpaper size exceeds maximum texture size."
* commit 'd9731a57c631a5218819dbb02755c4dd41e7cc44':
  Check and fail early if requested wallpaper size exceeds maximum texture size.
2013-02-27 23:22:28 +00:00
Svetoslav
b9dec1c3a7 am a60fdfac: NPE in AccessibilityManagerService.
* commit 'a60fdfac9432972e520e8c53b3b0717b4c3a2973':
  NPE in AccessibilityManagerService.
2013-02-27 23:22:22 +00:00
Dianne Hackborn
bf2798b387 am 9ad66541: Merge "New ContentProvider initialization for testing." into jb-mr2-dev
* commit '9ad665417713398524d425f63b0d6fa751244237':
  New ContentProvider initialization for testing.
2013-02-27 23:22:12 +00:00
Dmitry Shmidt
aded7f6486 am be1a8cda: wifi: Fix scan results merge
* commit 'be1a8cda3e8113d1fd3a6e56d8bc6c4f2d350423':
  wifi: Fix scan results merge
2013-02-27 23:22:10 +00:00
Dirk Dougherty
122f4051b5 am 99fd8c21: am 74d4638e: am a44583c1: am 8e4e5549: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit '99fd8c21caae6f01c9a14541505832d66c1dff89':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 22:51:12 +00:00
Dirk Dougherty
99fd8c21ca am 74d4638e: am a44583c1: am 8e4e5549: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit '74d4638e2821e21885528d79d5b39c0ac08d3740':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 14:49:52 -08:00
Dirk Dougherty
74d4638e28 am a44583c1: am 8e4e5549: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit 'a44583c12e81ff676e8e7f57791da6021ddf8ef5':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 14:47:12 -08:00
Dirk Dougherty
a44583c12e am 8e4e5549: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit '8e4e5549371dc4c373c67ea84cb21ce9cdf7502e':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 14:45:04 -08:00
Dirk Dougherty
8e4e554937 am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit 'd9019dd275f9a0a8be4ac8ae383e2878f78b5445':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 14:43:01 -08:00
Dirk Dougherty
d9019dd275 Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
Change-Id: I9bba5b8ffb7da40083904f6f471e99fd4c98d63d
Bug: 8033688
Bug: 8277558
2013-02-27 14:34:24 -08:00
Romain Guy
a6456d0d7e Merge "Draw text drop shadows even when the text color is transparent" into jb-mr2-dev 2013-02-27 22:16:22 +00:00
Romain Guy
13e3891b20 Merge "Don't increment the paint's generation ID when drawing bitmaps" into jb-mr2-dev 2013-02-27 22:08:32 +00:00
Chris Craik
6c5b9be745 Fix T-junctions in layers' generated meshes
bug:4128442

Currently we fix T-junctions for hardware layers, and for
Canvas.saveLayer if the transform isn't rectAsRect. Ideally, hardware
layers should lazily re-generate T-junction free geometry if the
transform becomes non-rectAsRect

Depends on frameworks/native change:
https://googleplex-android-review.googlesource.com/#/c/277668/
which adds Region::createTJunctionFreeRegion()

Change-Id: Ice75b4a1a4459ff835059ea81d70f7d1563fd96d
2013-02-27 14:03:19 -08:00
Romain Guy
768bffc9b8 Draw text drop shadows even when the text color is transparent
This matches Skia's behavior.

Change-Id: Ibf0a52611f5801cfa68169f66ab0ec06f256600f
2013-02-27 13:52:26 -08:00
Dianne Hackborn
c7288579c7 am 7f3a53a4: am 7b69e401: Merge "Fix starting window memory leak"
* commit '7f3a53a447d40db36f8f0c2b4c8c7305c5dd4429':
  Fix starting window memory leak
2013-02-27 20:09:27 +00:00
Ian Rogers
7e112d51c4 am 14d0ab55: am de3c20bc: Merge "Track stack memory in MemoryInfo."
* commit '14d0ab55e983d314128bb7b3293023f4a237d991':
  Track stack memory in MemoryInfo.
2013-02-27 20:09:25 +00:00
Dianne Hackborn
7f3a53a447 am 7b69e401: Merge "Fix starting window memory leak"
* commit '7b69e401769fb7a864990f3d732c6a7e8d7ec2f8':
  Fix starting window memory leak
2013-02-27 12:07:01 -08:00
Ian Rogers
14d0ab55e9 am de3c20bc: Merge "Track stack memory in MemoryInfo."
* commit 'de3c20bcb546e50980a642b72c1e8353e5bd2cdc':
  Track stack memory in MemoryInfo.
2013-02-27 12:06:58 -08:00
Dianne Hackborn
7b69e40176 Merge "Fix starting window memory leak" 2013-02-27 19:57:08 +00:00
Romain Guy
758724fd09 Don't increment the paint's generation ID when drawing bitmaps
When the renderer draws a bitmap as part of a display list with an
alpha < 1.0f, the paint is temporarily modified to alter the opacity
of the bitmap. This has the side effect of increasing the paint's
generation ID counter which can break paint caching.

Change-Id: I5055d059ad1639829fa50af3d946e296c4dab877
2013-02-27 11:53:12 -08:00
Ian Rogers
de3c20bcb5 Merge "Track stack memory in MemoryInfo." 2013-02-27 19:47:15 +00:00
Victoria Lease
7ff28ad2d1 Merge "round subpixels up to next integer in measureText DO NOT MERGE" into jb-mr2-dev 2013-02-27 19:39:14 +00:00
Victoria Lease
8e04840f38 round subpixels up to next integer in measureText DO NOT MERGE
A common source of layout bugs we're seeing these days involves the
output of measureText() being fed into StaticLayout's constructor.
measureText() returns subpixel-accurate values, but StaticLayout only
takes integral bounds, resulting in the subpixel portion of the
bounds being truncated. This leaves StaticLayout with insufficient
space to layout the text that was just measured, causing all manner
of unexpected line breaks.

This could be causing issues elsewhere, as well. Until our text
pipeline is fully subpixel-perfect, it's best that measureText
guarantee that the value it returns will be sufficient to contain
the text, even if cast to int.

Cherry-pick of Ib84947f0d0a1229287f5b19b99e7efd40f5317f7

Bug: 8164205
Change-Id: I69795ba5770112c0a3d0e752158076a8d1646b1a
2013-02-27 11:38:05 -08:00
Ian Rogers
7c9f30bfb3 Track stack memory in MemoryInfo.
In /proc/pid/maps the main stack is identified as "[stack]". In Linux 3.4
thread stacks are identified as "[stack:<tid>]" where <tid> is the thread ID of
the thread using that stack. Add support in MemInfo's otherStats to track
memory being used by the stack.

Add sanity check on the length of the otherStats array.
Add detail messages to two null pointer exceptions.

Bug: 8265251

Change-Id: I2b228b147da9bdc5c7a4d825dfc628fcc7923927
2013-02-27 11:34:42 -08:00
Irfan Sheriff
408f4edb5e Merge "Fix concurrency issues" into jb-mr2-dev 2013-02-27 19:17:28 +00:00
Irfan Sheriff
ab3b9fbfa0 Fix concurrency issues
Make true copy of list when passing off on broadcast

Bug: 8212369
Change-Id: Iaf4a303513d267f76bd16b845ec68baabfca6b45
2013-02-27 11:06:45 -08:00
Scott Main
35cd94ab97 am 4539955e: am 8f03a47e: am 464deaba: am 3383c015: am 9d167eaa: docs: another string change for developer console bug: 8033647
* commit '4539955e1d76fe1d2e7cea5eb20fdf51232234c2':
  docs: another string change for developer console bug: 8033647
2013-02-27 18:23:57 +00:00
Scott Main
4539955e1d am 8f03a47e: am 464deaba: am 3383c015: am 9d167eaa: docs: another string change for developer console bug: 8033647
* commit '8f03a47e5664243cb7ad50f63c8d411c55355550':
  docs: another string change for developer console bug: 8033647
2013-02-27 10:21:32 -08:00
Scott Main
8f03a47e56 am 464deaba: am 3383c015: am 9d167eaa: docs: another string change for developer console bug: 8033647
* commit '464deaba78650f0ba8aacb7c21361ed9ea4cbd8c':
  docs: another string change for developer console bug: 8033647
2013-02-27 10:20:06 -08:00
Scott Main
464deaba78 am 3383c015: am 9d167eaa: docs: another string change for developer console bug: 8033647
* commit '3383c01569ce62edb7ea886338ef563ab7345955':
  docs: another string change for developer console bug: 8033647
2013-02-27 10:18:54 -08:00
Scott Main
3383c01569 am 9d167eaa: docs: another string change for developer console bug: 8033647
* commit '9d167eaa7d43f7fb4a0dd77f0cbd8f09b566df4c':
  docs: another string change for developer console bug: 8033647
2013-02-27 10:16:36 -08:00
Scott Main
9d167eaa7d docs: another string change for developer console
bug: 8033647

Change-Id: Ia6b476e22f2e370eeefd0556e2c9d0b4295482a9
2013-02-27 10:08:27 -08:00
Baligh Uddin
2973ccdba8 Import translations. DO NOT MERGE
Change-Id: Icb6c650e3861376350a719adbe39ea67228a66c5
Auto-generated-cl: translation import
2013-02-27 09:13:55 -08:00
Ian Rogers
0493d7997e am 75dcb333: am 545464df: Merge "Deprecate and document memory allocation counting."
* commit '75dcb3338d85d12991249598e1ed407c8a6be1eb':
  Deprecate and document memory allocation counting.
2013-02-27 16:53:20 +00:00
Ian Rogers
75dcb3338d am 545464df: Merge "Deprecate and document memory allocation counting."
* commit '545464df282273209a837569f05e9990173f4d56':
  Deprecate and document memory allocation counting.
2013-02-27 08:50:56 -08:00
Ian Rogers
545464df28 Merge "Deprecate and document memory allocation counting." 2013-02-27 16:45:39 +00:00
The Android Automerger
b2d9751984 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-02-27 05:55:28 -08:00
Ben Murdoch
0e2f22a42b Merge "Update WebView#PictureListener for JBMR2." into jb-mr2-dev 2013-02-27 11:40:05 +00:00
Ben Murdoch
52643e0ceb Update WebView#PictureListener for JBMR2.
Now JBMR2 constant is defined, update code and docs to use it.

Bug: 8241082
Change-Id: If221c6524b79cc259ffc71fc218b141ffe6ed790
2013-02-27 11:38:25 +00:00
Romain Guy
d9731a57c6 am bf53be46: am 09353f74: Merge "Check and fail early if requested wallpaper size exceeds maximum texture size."
* commit 'bf53be46d237866a9964a4f1fa960eb6ef4a70a6':
  Check and fail early if requested wallpaper size exceeds maximum texture size.
2013-02-27 07:08:15 +00:00
Romain Guy
bf53be46d2 am 09353f74: Merge "Check and fail early if requested wallpaper size exceeds maximum texture size."
* commit '09353f747835c23d02df9e18ecdd6a7d1c91310c':
  Check and fail early if requested wallpaper size exceeds maximum texture size.
2013-02-26 23:05:44 -08:00
Romain Guy
09353f7478 Merge "Check and fail early if requested wallpaper size exceeds maximum texture size." 2013-02-27 06:07:31 +00:00
Svetoslav
a60fdfac94 NPE in AccessibilityManagerService.
If an accessibility service is connected but already removed
from the list of connecting services we get a NPE since the
call to set the service connection is made over a null
remove interface. Note that service connection is asynchronous.

bug:8229877

Change-Id: I7b05f219dd0c1da6286ee4ec90b1ef310908545d
2013-02-26 19:25:01 -08:00
Michael Wright
56fae73f30 Merge "Prevent repeated cursor movements from escaping a TextView" 2013-02-27 01:41:59 +00:00
Michael Wright
0d4cc209b9 Merge "Add default handlers for brightness keys" 2013-02-27 01:39:26 +00:00
Dianne Hackborn
9ad6654177 Merge "New ContentProvider initialization for testing." into jb-mr2-dev 2013-02-27 01:18:12 +00:00
Philip Milne
a26be59b05 Merge "When layoutMode is undefined, inherit the value defined by the parent (recursively)." 2013-02-27 01:02:35 +00:00