Craig Mautner
d26851d955
Merge "Refactor resetTaskIfNeededLocked for tasks."
2013-02-25 18:02:05 +00:00
Wink Saville
ff4fcdb98c
Tweak logging and some code reformatting.
...
Add logAndAddLogRec method that logs a string and adds it to LogRecords.
Add loge(s, e)
Add missing javadoc to the logging methods
Reformatted the code.
Change-Id: I42f39e45aae77e5b6968f16b6b83f4804ccb7e73
2013-02-24 07:21:45 -08:00
Craig Mautner
e3a74d5d64
Refactor resetTaskIfNeededLocked for tasks.
...
Change-Id: I1ad8b7ffe1f17490ebcb98ea48d57f0b15f888c9
2013-02-23 08:37:20 -08:00
Michael Wright
c50536b85a
Merge "Disable kernel keyrepeat"
2013-02-23 06:33:08 +00:00
Mathias Agopian
0d1ab1db22
Merge "regenerate egl/gles stubs from glgen"
2013-02-23 04:13:34 +00:00
Mathias Agopian
89be00bcda
regenerate egl/gles stubs from glgen
...
those are minor cosmetic changes.
Change-Id: I84ee5383577f0ca33ed7cc32d03e53c1475f068d
2013-02-22 20:08:06 -08:00
Dianne Hackborn
bd0dc13cb8
Merge "Formalize overscan metrics."
2013-02-23 03:15:35 +00:00
Dianne Hackborn
c4aad01cbb
Formalize overscan metrics.
...
The window manager now maintains and reports a new formal
"overscan insets" for each window, much like the existing
content and visible insets. This is used to correctly
position the various UI elements in the various combination
of layout options. In particular, this allows us to have
an activity that is using fitSystemWindows to have the content
of its UI extend out to the visible content part of the screen
while still positioning its fixed UI elements inside the
standard content rect (and the entire window extending all
the way into the overscan area to fill the screen as desired).
Okay, maybe that is not written so clearly. Well, it made
my head hurt too, so suffer!
The key thing is that windows now need to know about three
rectangles: the overall rectangle of the window, the rectangle
inside of the overscan area, and the rectangle inside of the
content area. The FLAG_LAYOUT_IN_OVERSCAN option controls
whether the second rectangle is pushed out to fill the entire
overscan area.
Also did some improvements to debug dumping in the window
manager.
Change-Id: Ib2368c4aff5709d00662c799507c37b6826929fd
2013-02-22 19:14:37 -08:00
Jason Sams
460fdd427c
Merge "add support for debug and profile contexts."
2013-02-23 02:44:49 +00:00
Jason Sams
add26dca07
add support for debug and profile contexts.
...
Change-Id: I759e54e365a344a93d725eb4fa70a2c4c98bf05a
2013-02-22 18:43:45 -08:00
Chris Craik
fb68065709
Merge "Add deferredList null check"
2013-02-23 00:42:53 +00:00
Chris Craik
ba868c3e22
Add deferredList null check
...
Needed for non-deferred mode (debug.hwui.disable_draw_defer = true)
Change-Id: I278cbe200aa6ce06fa92dc45c63ceda6e85a0cbe
2013-02-22 16:28:27 -08:00
Chris Craik
dd8697c095
Avoid double blur
...
bug:8204062
Avoids incorrectly blurring with RenderScript after a C++ blur
Additionally, avoids draw/blurring if the input text has empty bounds
Change-Id: Ibbaf74800fff7a6e4cda3aa24286b90e7aef589d
2013-02-22 16:16:16 -08:00
Robert Greenwalt
786525e8ea
Merge "Remove two new permission checks"
2013-02-22 23:51:53 +00:00
Robert Greenwalt
e436e4f8a4
Remove two new permission checks
...
These checks while technically reasonable are a hard to swallow API change
that may break existing apps and pragmatically serves no purpose: the protected
data is available in publicly readable java VM properties.
Change-Id: I522c493c2604a33e28d99e2be31054326c9a8323
2013-02-22 15:36:33 -08:00
Baligh Uddin
69a8dbbd67
Merge "Import translations. DO NOT MERGE"
2013-02-22 23:27:47 +00:00
Michael Wright
a0a72850c2
Disable kernel keyrepeat
...
Bug: 6332980
Change-Id: Ife69167285aad24ed3e4fa5b65abf59d8dfa4f0a
2013-02-22 14:46:49 -08:00
Jason Sams
ea53d7e0a4
Merge "Remove surfaceTextureOpaque test."
2013-02-22 22:31:09 +00:00
Adam Powell
0d74e8f8c6
am 06689433: am d61ff77e: Merge "Fix ListView is not scrolled properly with arrows"
...
* commit '06689433bc9e9d54e01bf4af9526dff2fc3dc862':
Fix ListView is not scrolled properly with arrows
2013-02-22 14:09:30 -08:00
Adam Powell
06689433bc
am d61ff77e: Merge "Fix ListView is not scrolled properly with arrows"
...
* commit 'd61ff77ee10b2c956df153e08b850e852ff5df57':
Fix ListView is not scrolled properly with arrows
2013-02-22 14:06:11 -08:00
Jason Sams
fa5cb40793
Merge "Fix build break."
2013-02-22 21:59:19 +00:00
Jason Sams
c089c2fc00
Fix build break.
...
Change-Id: I362c96787482bc8daee7dd4a01817ab7ed79b730
2013-02-22 13:57:36 -08:00
Jason Sams
fc0fd4f52c
Remove surfaceTextureOpaque test.
...
This test was for an API we decided not to
expose publically and have removed.
Change-Id: Ic2b8449b286c8d1fb1432ccc2db47f96ad43cc4b
2013-02-22 13:53:44 -08:00
Dirk Dougherty
84956b36ec
am ce7533d2: am a4ebda27: am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev
...
* commit 'ce7533d24f6d06011728272a11801b693aa224f2':
fix javadocs
2013-02-22 13:51:44 -08:00
Dirk Dougherty
ce7533d24f
am a4ebda27: am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev
...
* commit 'a4ebda27c9c4c6383520b07d4130b02f0564da27':
fix javadocs
2013-02-22 13:48:02 -08:00
Romain Guy
505d1d64ed
Merge "Prettify display lists logging"
2013-02-22 21:45:57 +00:00
Dirk Dougherty
a4ebda27c9
am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev
...
* commit '380d571a65ec6866768c74e3ff360a6620b0d212':
fix javadocs
2013-02-22 13:44:11 -08:00
Dirk Dougherty
380d571a65
am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev
...
* commit 'dc591c0bf6394f725e5dcf773193adba14e5ccaf':
fix javadocs
2013-02-22 13:41:56 -08:00
Dirk Dougherty
dc591c0bf6
am f15b0908: Merge "fix javadocs" into jb-mr1-dev
...
* commit 'f15b0908a773850007c0d0b6de54b1dc008abf6f':
fix javadocs
2013-02-22 13:38:34 -08:00
Jason Sams
ec39a94ac2
Merge "Implement USAGE_IO_INPUT"
2013-02-22 21:35:12 +00:00
Dirk Dougherty
f15b0908a7
Merge "fix javadocs" into jb-mr1-dev
2013-02-22 21:35:11 +00:00
Robert Ly
894174b4b0
fix javadocs
...
Change-Id: Iba5344980ecaaff5efcc60f8515af23957b64687
2013-02-22 13:32:43 -08:00
Adam Powell
d61ff77ee1
Merge "Fix ListView is not scrolled properly with arrows"
2013-02-22 21:29:44 +00:00
Jason Sams
72226e0543
Implement USAGE_IO_INPUT
...
Change-Id: Id5b9e3d0a17e4df15eec36d542fde6dc626138b2
2013-02-22 12:45:54 -08:00
Adam Koch
51b4484a2d
am 42e15925: am c2226157: am 16fcd4ba: am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
...
* commit '42e1592523b9e805f3f1111bd6687ff1ff577dc5':
Displaying Bitmaps Efficiently Training - Update sample app zip
2013-02-22 12:12:47 -08:00
Adam Koch
42e1592523
am c2226157: am 16fcd4ba: am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
...
* commit 'c22261578ae11dc12393346565a374b64678d0d0':
Displaying Bitmaps Efficiently Training - Update sample app zip
2013-02-22 12:09:15 -08:00
Adam Koch
c22261578a
am 16fcd4ba: am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
...
* commit '16fcd4ba4ab72c3ae45bf8b9cc084dfb193465c3':
Displaying Bitmaps Efficiently Training - Update sample app zip
2013-02-22 12:06:29 -08:00
Adam Koch
16fcd4ba4a
am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
...
* commit 'e74f2a32a416a42feb13a5cba31a1f7567d77a0a':
Displaying Bitmaps Efficiently Training - Update sample app zip
2013-02-22 12:03:42 -08:00
Robert Greenwalt
a3f0665c62
Merge "Improve ConnectivityManager docs"
2013-02-22 20:02:02 +00:00
Adam Koch
e74f2a32a4
am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
...
* commit 'b367fd6a87116933b76e5e9bc162dcfe88306aa6':
Displaying Bitmaps Efficiently Training - Update sample app zip
2013-02-22 12:01:39 -08:00
Adam Koch
b367fd6a87
Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev
2013-02-22 19:58:34 +00:00
Romain Guy
7031ff68bb
Prettify display lists logging
...
This change makes it a lot easier to see the tree structure.
Change-Id: I4969abd1eb010f1d529671f8d86dc4c930be24f6
2013-02-22 11:51:15 -08:00
Ian Rogers
7508039d66
am 631bc614: am 08a92a33: Merge "Account malloc mmaped pages as native heap."
...
* commit '631bc614f52015a2f068c2e66030e9aa47508fb5':
Account malloc mmaped pages as native heap.
2013-02-22 11:04:16 -08:00
Ian Rogers
631bc614f5
am 08a92a33: Merge "Account malloc mmaped pages as native heap."
...
* commit '08a92a335fd84ca427b55c6c2d39f72970d82b76':
Account malloc mmaped pages as native heap.
2013-02-22 10:53:59 -08:00
Craig Mautner
12e563fff9
Merge "Create rotation animation modes."
2013-02-22 18:51:21 +00:00
Craig Mautner
3c1743705c
Create rotation animation modes.
...
Allow fullscreen windows to specify crossfade or jumpcut animations
that override the default rotation animation. Only if the incoming
and outgoing topmost windows are fullscreen and both specify the
same animation to use.
Fixes bug 8182773.
Change-Id: I6b3c0020d7bd2cdfba5c66189e114ec62cd54fcf
2013-02-22 10:44:52 -08:00
Irfan Sheriff
d99375528c
Merge "Clean up scan handling"
2013-02-22 18:40:24 +00:00
Robert Greenwalt
5a6bdc46e2
Improve ConnectivityManager docs
...
Also fix some permission problems.
bug:5738328
Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf
2013-02-22 10:39:20 -08:00
Derek Sollenberger
bc340d03c3
Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"
2013-02-22 18:39:13 +00:00
Daniel Sandler
9d81e32455
Merge "Make QUICK_CLOCK work on tablets."
2013-02-22 18:19:35 +00:00