summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Disable kernel keyrepeat"Michael Wright2013-02-231-0/+6
|\
| * Disable kernel keyrepeatMichael Wright2013-02-221-0/+6
| | | | | | | | | | Bug: 6332980 Change-Id: Ife69167285aad24ed3e4fa5b65abf59d8dfa4f0a
* | Merge "regenerate egl/gles stubs from glgen"Mathias Agopian2013-02-233-11/+10
|\ \
| * | regenerate egl/gles stubs from glgenMathias Agopian2013-02-223-11/+10
| | | | | | | | | | | | | | | | | | those are minor cosmetic changes. Change-Id: I84ee5383577f0ca33ed7cc32d03e53c1475f068d
* | | Merge "Formalize overscan metrics."Dianne Hackborn2013-02-2316-162/+335
|\ \ \
| * | | Formalize overscan metrics.Dianne Hackborn2013-02-2216-162/+335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "add support for debug and profile contexts."Jason Sams2013-02-233-9/+46
|\ \ \ \ | |/ / / |/| | |
| * | | add support for debug and profile contexts.Jason Sams2013-02-223-9/+46
| | | | | | | | | | | | | | | | Change-Id: I759e54e365a344a93d725eb4fa70a2c4c98bf05a
* | | | Merge "Add deferredList null check"Chris Craik2013-02-231-3/+5
|\ \ \ \
| * | | | Add deferredList null checkChris Craik2013-02-221-3/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | Needed for non-deferred mode (debug.hwui.disable_draw_defer = true) Change-Id: I278cbe200aa6ce06fa92dc45c63ceda6e85a0cbe
* | | | Avoid double blurChris Craik2013-02-221-3/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Remove two new permission checks"Robert Greenwalt2013-02-221-2/+8
|\ \ \
| * | | Remove two new permission checksRobert Greenwalt2013-02-221-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-2249-51/+99
|\ \ \ \ | |/ / / |/| | |
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-02-2249-51/+99
| | | | | | | | | | | | | | | | | | | | Change-Id: I26214599db1cab9d2c5847860d43e008d0e463ab Auto-generated-cl: translation import
* | | | Merge "Remove surfaceTextureOpaque test."Jason Sams2013-02-228-556/+0
|\ \ \ \
| * | | | Remove surfaceTextureOpaque test.Jason Sams2013-02-228-556/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was for an API we decided not to expose publically and have removed. Change-Id: Ic2b8449b286c8d1fb1432ccc2db47f96ad43cc4b
* | | | | am 06689433: am d61ff77e: Merge "Fix ListView is not scrolled properly with ↵Adam Powell2013-02-221-3/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arrows" * commit '06689433bc9e9d54e01bf4af9526dff2fc3dc862': Fix ListView is not scrolled properly with arrows
| * \ \ \ \ am d61ff77e: Merge "Fix ListView is not scrolled properly with arrows"Adam Powell2013-02-221-3/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd61ff77ee10b2c956df153e08b850e852ff5df57': Fix ListView is not scrolled properly with arrows
| | * \ \ \ \ Merge "Fix ListView is not scrolled properly with arrows"Adam Powell2013-02-221-3/+15
| | |\ \ \ \ \
| | | * | | | | Fix ListView is not scrolled properly with arrowsJaewan Kim2013-02-091-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to ListView's layoutChildren logic, it detaches all children and rebuilds its children based on visible area which might omit invisible elements in the adapter. In this case, arrowScroll methods only tries to find next scroll candidates from its children so user is unable to scroll more with D-pad. This fixes the issue by look forward next child among the adapter as well as children. Bug: 7346868 Change-Id: I01ab19ad899b5bcb5ab420ddf08c9ffd136933d1
* | | | | | | | Merge "Fix build break."Jason Sams2013-02-221-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix build break.Jason Sams2013-02-221-0/+7
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I362c96787482bc8daee7dd4a01817ab7ed79b730
* | | | | | | | am ce7533d2: am a4ebda27: am 380d571a: am dc591c0b: am f15b0908: Merge "fix ↵Dirk Dougherty2013-02-221-7/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javadocs" into jb-mr1-dev * commit 'ce7533d24f6d06011728272a11801b693aa224f2': fix javadocs
| * | | | | | | am a4ebda27: am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" ↵Dirk Dougherty2013-02-221-7/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'a4ebda27c9c4c6383520b07d4130b02f0564da27': fix javadocs
| | * \ \ \ \ \ \ am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-devDirk Dougherty2013-02-221-7/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '380d571a65ec6866768c74e3ff360a6620b0d212': fix javadocs
| | | * \ \ \ \ \ \ am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-devDirk Dougherty2013-02-221-7/+1
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc591c0bf6394f725e5dcf773193adba14e5ccaf': fix javadocs
| | | | * \ \ \ \ \ \ am f15b0908: Merge "fix javadocs" into jb-mr1-devDirk Dougherty2013-02-221-7/+1
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f15b0908a773850007c0d0b6de54b1dc008abf6f': fix javadocs
| | | | | * \ \ \ \ \ \ Merge "fix javadocs" into jb-mr1-devDirk Dougherty2013-02-221-7/+1
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | fix javadocsRobert Ly2013-02-221-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba5344980ecaaff5efcc60f8515af23957b64687
* | | | | | | | | | | | | Merge "Prettify display lists logging"Romain Guy2013-02-224-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Prettify display lists loggingRomain Guy2013-02-224-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes it a lot easier to see the tree structure. Change-Id: I4969abd1eb010f1d529671f8d86dc4c930be24f6
* | | | | | | | | | | | | | Merge "Implement USAGE_IO_INPUT"Jason Sams2013-02-225-72/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Implement USAGE_IO_INPUTJason Sams2013-02-225-72/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5b9e3d0a17e4df15eec36d542fde6dc626138b2
* | | | | | | | | | | | | | am 42e15925: am c2226157: am 16fcd4ba: am e74f2a32: am b367fd6a: Merge ↵Adam Koch2013-02-221-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Displaying Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev * commit '42e1592523b9e805f3f1111bd6687ff1ff577dc5': Displaying Bitmaps Efficiently Training - Update sample app zip
| * | | | | | | | | | | | | am c2226157: am 16fcd4ba: am e74f2a32: am b367fd6a: Merge "Displaying ↵Adam Koch2013-02-221-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bitmaps Efficiently Training - Update sample app zip" into jb-mr1-dev * commit 'c22261578ae11dc12393346565a374b64678d0d0': Displaying Bitmaps Efficiently Training - Update sample app zip
| | * | | | | | | | | | | | am 16fcd4ba: am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently ↵Adam Koch2013-02-221-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Training - Update sample app zip" into jb-mr1-dev * commit '16fcd4ba4ab72c3ae45bf8b9cc084dfb193465c3': Displaying Bitmaps Efficiently Training - Update sample app zip
| | | * | | | | | | | | | | am e74f2a32: am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - ↵Adam Koch2013-02-221-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sample app zip" into jb-mr1-dev * commit 'e74f2a32a416a42feb13a5cba31a1f7567d77a0a': Displaying Bitmaps Efficiently Training - Update sample app zip
| | | | * | | | | | | | | | am b367fd6a: Merge "Displaying Bitmaps Efficiently Training - Update sample ↵Adam Koch2013-02-221-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app zip" into jb-mr1-dev * commit 'b367fd6a87116933b76e5e9bc162dcfe88306aa6': Displaying Bitmaps Efficiently Training - Update sample app zip
| | | | | * | | | | | | | | Merge "Displaying Bitmaps Efficiently Training - Update sample app zip" into ↵Adam Koch2013-02-221-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| | | | | | * | | | | | | | Displaying Bitmaps Efficiently Training - Update sample app zipAdam Koch2013-02-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I97faf4bcf5c46083fdbe2bb094be9a3bcfff0bd8
* | | | | | | | | | | | | | Merge "Improve ConnectivityManager docs"Robert Greenwalt2013-02-223-77/+390
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Improve ConnectivityManager docsRobert Greenwalt2013-02-223-77/+390
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix some permission problems. bug:5738328 Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf
* | | | | | | | | | | | | | am 631bc614: am 08a92a33: Merge "Account malloc mmaped pages as native heap."Ian Rogers2013-02-221-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '631bc614f52015a2f068c2e66030e9aa47508fb5': Account malloc mmaped pages as native heap.
| * | | | | | | | | | | | | am 08a92a33: Merge "Account malloc mmaped pages as native heap."Ian Rogers2013-02-221-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '08a92a335fd84ca427b55c6c2d39f72970d82b76': Account malloc mmaped pages as native heap.
| | * | | | | | | | | | | | Merge "Account malloc mmaped pages as native heap."Ian Rogers2013-02-221-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Account malloc mmaped pages as native heap.Ian Rogers2013-02-221-1/+2
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when malloc uses a page rather than brk the heap gets accounted as ashmem memory. Previously the memory would be accounted as unknown but since [1] it gets accounted as ashmem. This change makes the accounting see this memory as being native, ie the same kind of memory we associate with brk. [1] https://android-review.googlesource.com/#/c/49583/3 Change-Id: I6f496cfeb590268d41d8e047b12cd5c90359e2b0
* | | | | | | | | | | | | | Merge "Create rotation animation modes."Craig Mautner2013-02-2210-25/+233
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Create rotation animation modes.Craig Mautner2013-02-2210-25/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge "Clean up scan handling"Irfan Sheriff2013-02-227-120/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \