101122 Commits

Author SHA1 Message Date
Irfan Sheriff
bfadb84f9d am f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev
* commit 'f9d3020c575fd20097f599dc336a3b448415b7d7':
  Clean up statemachine
2013-03-04 22:40:35 +00:00
Irfan Sheriff
f9d3020c57 Merge "Clean up statemachine" into jb-mr2-dev 2013-03-04 22:38:30 +00:00
Christopher Tate
f9ed8be17d am 8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get a drag-ended after being detached" into jb-mr2-dev
* commit '8edd78499e2656916e89eeae91aa0f023f69eddc':
  DO NOT MERGE: Don't crash when we get a drag-ended after being detached
2013-03-04 22:13:33 +00:00
Christopher Tate
8edd78499e Merge "DO NOT MERGE: Don't crash when we get a drag-ended after being detached" into jb-mr2-dev 2013-03-04 22:11:43 +00:00
Christopher Tate
267097b00b DO NOT MERGE: Don't crash when we get a drag-ended after being detached
Removing view groups during a drag would cause an NPE here.  The
child views will still get the drag-ended event as expected.

(Cherrypicked from downstream)

Bug 8298439

Change-Id: Ic14cbf9fdc305b91c1627f6882a45d34ee1c34ae
2013-03-04 14:02:29 -08:00
Romain Guy
f2f3988ecb am e7d32b19: Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev
* commit 'e7d32b19b46c65ff37001e456bedf68222599119':
  Take text scale/skew into account only when rendering into a layer
2013-03-04 21:53:42 +00:00
Romain Guy
e7d32b19b4 Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev 2013-03-04 21:49:16 +00:00
Romain Guy
19d4dd8599 Take text scale/skew into account only when rendering into a layer
3D rotations can undo scale/skew transforms; since FreeType only accepts
2x2 matrices we can end up generating very large glyphs that are drawn
at a 1:1 scale on screen. For instance, if the current transform has a
scale of 2000 set on both X and Y axis and a perspective Z factor set to
Z, the actual scale factor on screen ends up being 1. We would however
generate glyphs with a scale factor of 2000 causing the font renderer
to blow up.

Change-Id: Ia5c3618d36644e817825cb9c89e2f53aece2074e
2013-03-04 13:48:43 -08:00
Irfan Sheriff
fd7adc58ec Clean up statemachine
- Remove a few unnecessary states. Driver is part of kernel for all devices.
- Clean up some logs

Change-Id: Id067bd944fcb01a279485b8fb3251c92a6894c55
2013-03-04 13:41:50 -08:00
Ben Murdoch
87adbaa3e0 am 4c333e17: Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev
* commit '4c333e177220387cf6746d47e1948bbfcc374512':
  Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE
2013-03-04 19:43:37 +00:00
Ben Murdoch
4c333e1772 Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 2013-03-04 19:40:55 +00:00
The Android Open Source Project
e5e78ccb3d Reconcile with jb-mr2-release - do not merge
Change-Id: I1bf36dd86f8c7a12978de0de6d9c19ec615f78e6
2013-03-04 11:06:41 -08:00
Chris Craik
3e7dbf5373 Merge "Document that degenerate lines wont be drawn" into jb-mr2-dev 2013-03-04 18:58:19 +00:00
JP Abgrall
62f16bfc5e jni: net.TrafficStats: fix getIfaceStat, have it use the iface.
Missing iface8 in call to parseIfaceStats().

Bug: 8304054
Change-Id: Ibb01d86a0f7241cdd8f23401973840673f847efb
2013-03-04 18:53:07 +00:00
Chris Craik
a5ef27da95 Document that degenerate lines wont be drawn
bug:7658830

Skia and the HW acceleration path don't render anything for degenerate
lines.

Change-Id: I5ea6fe8f16533e5045a7cd10475f4240f6c311b6
2013-03-04 10:41:55 -08:00
Irfan Sheriff
d2bfa3bdc0 Merge "Fix copy constructor" into jb-mr2-dev 2013-03-04 18:32:49 +00:00
Irfan Sheriff
90082124aa Fix copy constructor
Bug: 8300712
Change-Id: If1c41a9fe35ca5950382ffcc5759fc14641d0b04
2013-03-04 10:28:42 -08:00
Derek Sollenberger
cdac497289 Deprecate read/write Pictures to streams.
bug: 8241089
Change-Id: I435a534f5110cb2b8aba87c047b509020a22fd67
2013-03-04 10:10:15 -05:00
The Android Automerger
898753cb74 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-04 05:55:46 -08:00
Michael Jurka
7ac02bfb86 Merge "Fix RTL layout in Recent Apps, landscape mode" into jb-mr2-dev 2013-03-04 10:56:58 +00:00
Jeff Sharkey
2e0da1ea5f Merge "Improve performance of storage measurement." into jb-mr2-dev 2013-03-02 06:14:51 +00:00
Romain Guy
151b71cb52 Merge "Fix math issue when transforming text in perspective" into jb-mr2-dev 2013-03-02 02:08:18 +00:00
Romain Guy
874f5c6e4a Fix math issue when transforming text in perspective
Change-Id: Iad6b4e477c11bd1ef5f0ceab2fabcd440030154d
2013-03-01 18:07:35 -08:00
Jeff Sharkey
63d0a06799 Improve performance of storage measurement.
When calculating directory sizes of data living on emulated external
storage, translate the path to use the internal backing data, which
avoids going through the emulation layer.  It carefully retreats to
the original path when it runs into trouble.

Testing with a hierarchy of 10 directories deep and 2 directories
and 10 files wide at each level, this change improves performance
from 5900ms before to 250ms after; over 20 times faster (!).

Bug: 8172425
Change-Id: Ia7365416f091e102bf7345a49f7d7209a22580a9
2013-03-01 16:36:52 -08:00
Romain Guy
28459117a7 Merge "Precache glyphs at final raster size" into jb-mr2-dev 2013-03-02 00:13:17 +00:00
Romain Guy
0f6675332c Precache glyphs at final raster size
The deferred display lists model now allows us to precache glyphs
at their exact size on screen.

This change also removes debug markers when the renderer defers
and reorders display lists. It also adds a flush event marker.

Change-Id: I66ec5216dc12b93ecfdad52a7146b1cfb31fbeb4
2013-03-01 16:04:53 -08:00
Justin Koh
76f065d2e9 Merge "Add policy check to always show overflow menu button on TV devices." into jb-mr2-dev 2013-03-01 23:57:26 +00:00
Michael Wright
32440aa25d Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev 2013-03-01 22:20:46 +00:00
Michael Wright
7dd5bb18d4 Unify inputDispatchingTimedOut with keyDispatchingTimedOut
Bug: 8194916
Change-Id: Iac40108d848bcca77f49a7a49c57a095b3dbe9c9
2013-03-01 14:14:35 -08:00
Selim Gurun
7be6d4c421 Merge "Clarify the API documentation for WebSQL database." into jb-mr2-dev 2013-03-01 21:46:42 +00:00
Selim Gurun
2bca22b2a5 Clarify the API documentation for WebSQL database.
Bug: 8231270

WebSQL database is disabled by default. And setting change to
enable it must precede the first url navigation. This change
is to clarify this behavior.

Change-Id: Ic0aab764821daece83f3482b30df4bebc7ff1f37
2013-03-01 13:35:12 -08:00
Jonathan Dixon
1001012808 Merge "Remove obsolete target-densitydpi documentation" into jb-mr2-dev 2013-03-01 21:09:06 +00:00
Justin Koh
4207fda51b Add policy check to always show overflow menu button on TV devices.
Add policy check to always show overflow menu button on TV devices.
Bug: 8236681

Change-Id: I4f92eef7a6d530feb698f83b0720b36115f7a04a
2013-03-01 13:03:20 -08:00
Dmitry Shmidt
a7f9b4e909 Merge "wifi: Add checking for scan results EOB" into jb-mr2-dev 2013-03-01 20:12:53 +00:00
Chris Craik
1da8a6a36d Merge "Add shader program selection shortcut" into jb-mr2-dev 2013-03-01 19:42:38 +00:00
Romain Guy
9becfc168b Restore the ability to track native Surface changes
Bug #8230990

ViewRootImpl needs to know when the native Surface objects changes
to recreate the EGL surface. A recent refactoring in Surface broke
the behavior of getGenerationId(). This simply restores the old
behavior (every change increments the generation ID by 1.)

Change-Id: Ife1df1ffb2ee7a373b8ebf2431192702ba10f344
2013-03-01 11:36:01 -08:00
Romain Guy
7b720ac67c Support 3D rotations when drawing text
If a perspective transform is set on the Canvas, drawText() should
not attempt to rasterize glyphs in screen space. This change uses
the old behavior instead (i.e. rasterize the glyphs at the native
font size and apply the transform on the resulting mesh.)

This change also adds an optimization: empty glyphs (spaces) do
not generate vertices anymore. This saves a lot of vertices in text
heavy applications such as Gmail.

Change-Id: Ib531384163f5165b5785501612a7b1474f3ff599
2013-03-01 11:35:48 -08:00
Chris Craik
65742dd1ee Account for text alignment in Op bounds calculation
bug:8243821

Previously this wasn't done for deferred clipping + reordering, so
non-left-aligned text would be clipped at defer time, when it wouldn't
have been at draw time (in OpenGLRenderer::quickReject())

Change-Id: Ic96949c2dca4378f284606b37d9411ed42f8d203
2013-03-01 11:35:32 -08:00
Scott Main
624de6854f am 44e087bd: am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
* commit '44e087bdba93817f2031e20b0c189c548e1fef5d':
  docs: add bdc's security doc as training article
2013-03-01 19:13:37 +00:00
Scott Main
44e087bdba am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
* commit 'a3279494a451bac0c906d518a2c5a51934727db9':
  docs: add bdc's security doc as training article
2013-03-01 11:11:52 -08:00
Chris Craik
096b8d96d5 Add shader program selection shortcut
Add a key manipulation that makes black text/paths use the standard
simple bitmap/patch shader, since they are the same. Previously we'd
create a separate shader for each because the keys differed, even
though the shaders were functionally equivalent.

Also fixes some issues around setting DEBUG_PROGRAM

Change-Id: I0c77c684d58da03501ee9ab8239c7d4a70fd6b5c
2013-03-01 11:11:31 -08:00
Scott Main
a3279494a4 am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
* commit '8d5b88463b37cc254ed8333506fc47bb1ec193bb':
  docs: add bdc's security doc as training article
2013-03-01 11:09:14 -08:00
Scott Main
8d5b88463b am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
* commit '16bdd13ec7e64c04e1a17b94ffcb2a08f3b47518':
  docs: add bdc's security doc as training article
2013-03-01 11:06:49 -08:00
Scott Main
16bdd13ec7 am 00158363: docs: add bdc\'s security doc as training article
* commit '00158363b47d916d159d2f3a0e1152783fd66a9c':
  docs: add bdc's security doc as training article
2013-03-01 11:04:27 -08:00
Baligh Uddin
b237b9e081 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-01 18:20:24 +00:00
Nick Kralevich
2ce5173afb Merge commit '199f9655' into manualmerge
these files no longer exist in jb-mr2-dev, so this patch is useless.
Accept the version in jb-mr2-dev
2013-03-01 10:01:29 -08:00
Dmitry Shmidt
bca462a2dc wifi: Add checking for scan results EOB
Change-Id: I969079b72fdffe1b84d88242caa6b6281d1f02b1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-03-01 09:57:58 -08:00
Scott Main
00158363b4 docs: add bdc's security doc as training article
Change-Id: Iaee006f5e93356cc7cda8e5bff7fc03642329e46
2013-03-01 09:49:41 -08:00
Nick Kralevich
e606757966 am edb95c3f: am 937cfa77: Merge "ZygoteInit: use correct header files."
* commit 'edb95c3f3ca4e51ef0432af925b8f4330e6dae81':
  ZygoteInit: use correct header files.
2013-03-01 17:41:53 +00:00
Nick Kralevich
199f965552 am f5276c16: Merge "installd: use correct header file."
* commit 'f5276c16ad97d94f8773938012ae54f8c7ba450a':
  installd: use correct header file.
2013-03-01 09:39:45 -08:00