Scott Main
0979239a25
am 73c1882f: am 90e2e8db: am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev
...
* commit '73c1882fd8243ded351c453c98d2b8c6fba7dba8':
add jb-mr2 api overview
2013-06-21 20:32:35 -07:00
Scott Main
73c1882fd8
am 90e2e8db: am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev
...
* commit '90e2e8db2f74b25cff0cfe7e59f88a37d49da3a8':
add jb-mr2 api overview
2013-06-21 20:28:09 -07:00
Scott Main
90e2e8db2f
am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev
...
* commit '4129cfe1e4abf2366e395f36804a866b13241d28':
add jb-mr2 api overview
2013-06-21 20:25:45 -07:00
Scott Main
4129cfe1e4
Merge "add jb-mr2 api overview" into jb-mr2-dev
2013-06-22 03:23:50 +00:00
Scott Main
8cc7db7d40
add jb-mr2 api overview
...
Change-Id: Ib46c3ad3318d19927f47f1bb0ada93adf7766147
2013-06-21 20:20:40 -07:00
Svetoslav Ganov
352e4b5b3a
Merge "Print - platform APIs"
2013-06-22 01:44:35 +00:00
Svetoslav Ganov
4b9a4d1687
Print - platform APIs
...
Related changes:
Skia (inlcude PDF APIs): https://googleplex-android-review.googlesource.com/#/c/305814/
Canvas to PDF: https://googleplex-android-review.googlesource.com/#/c/319367/
Settings (initial version): https://googleplex-android-review.googlesource.com/#/c/306077/
Build: https://googleplex-android-review.googlesource.com/#/c/292437/
Sample print services: https://googleplex-android-review.googlesource.com/#/c/281785/
Change-Id: I104d12efd12577f05c7b9b2a5e5e49125c0f09da
2013-06-21 18:43:17 -07:00
Geremy Condra
466606f1fd
Merge "Remove logging of KeySet parse errors."
2013-06-22 00:41:53 +00:00
Geremy Condra
a2d8eae289
Remove logging of KeySet parse errors.
...
Bug: 9532748
Change-Id: I3cce41de74783a121d2cd4f7b0ea6dfa03e3d7c5
2013-06-21 16:59:42 -07:00
Dianne Hackborn
142dd91583
Merge "Faster PrintWriter."
2013-06-21 23:49:08 +00:00
Romain Guy
35c70f94ef
Merge "When destroying a surface, only unmake current if necessary Bug #9404946 "
2013-06-21 23:44:32 +00:00
Romain Guy
c8ba0b4616
When destroying a surface, only unmake current if necessary
...
Bug #9404946
The Calendar app destroys one of its popup windows during a draw
traversal. Without this patch, we end up with no current context
nor surface after we're done gathering display lists. This means
that all of our EGL/GL calls will either fail or have undefined
behaviors. This could explain the PBO crash we are seeing with
the monkeys. Without a proper GL context, the driver returns NULL
when we map the PBO in CPU memory.
Change-Id: I210cf724be73da909a7621f807298a9f4a58e61d
2013-06-21 16:40:30 -07:00
kmccormick
00c5620acf
am 30c8973f: am 75c59fb9: am dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
...
* commit '30c8973f66ad035a1734c8e53173b58ac1fbd32d':
Doc change: new Bluetooth LE doc
2013-06-21 16:34:40 -07:00
kmccormick
30c8973f66
am 75c59fb9: am dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
...
* commit '75c59fb9d9a1408146165300eae0899a965897bf':
Doc change: new Bluetooth LE doc
2013-06-21 16:31:41 -07:00
Jim Miller
6b6bdc5923
Merge "Fix alpha animation bug in keyguard"
2013-06-21 23:29:29 +00:00
kmccormick
75c59fb9d9
am dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
...
* commit 'dc22fa924a6df52fb6ad97aa63150c815a2f047f':
Doc change: new Bluetooth LE doc
2013-06-21 16:29:23 -07:00
Chet Haase
2ea7f8b9c5
Refactoring/simplifying Transition code/API
...
Transitions used to be three phase:
- captureValues(): get all relevant property values in the
affected view targets
- setup(): set appropriate start values for affected views
prior to any transitions being played
- play(): create/play Animators for affected views
Now the second and third phases have been collapsed (and named
"play()"). This single step sets initial values for target views
and creates any Animators that should be played during the transition.
The transition mechanism stores these Animators and then starts
them at the appropriate time in the overall transition.
Issue #9507585 Transitions: Simplify Transition.play() design
Change-Id: I3fc67599b38fe49eee885dc5d32444db90b7703b
2013-06-21 16:07:14 -07:00
Dianne Hackborn
db4e33f1f1
Faster PrintWriter.
...
Change-Id: I4e1ae7e0357214deb7e19ae65f8701b69b347c6e
2013-06-21 16:00:30 -07:00
kmccormick
dc22fa924a
Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
2013-06-21 23:00:18 +00:00
Michael Wright
862a301bf9
Merge "Paint current points a different color in PointerLocation"
2013-06-21 22:26:36 +00:00
Michael Wright
76936eb96a
Paint current points a different color in PointerLocation
...
Change-Id: I05be4ce1886f944cd948ded4d9ace08d70cdb00e
2013-06-21 15:18:06 -07:00
Dianne Hackborn
f35f56a1bd
Merge "More procstats work: separate global proc account, more dumping."
2013-06-21 22:06:28 +00:00
Dianne Hackborn
a17c0f5e16
More procstats work: separate global proc account, more dumping.
...
We now keep track of the time actually process run independently
of the time packages run in process, so we can give an accurate
summary of how long each physical process runs.
New command line options can be supplied to restrict printing to
a specific package, dump in a new csv format, control what is
printed in the csv format, and print a checkin report.
Add toString methods to ArrayMap and ArraySet.
Change-Id: I47b8f68472592ecc0088c5286d3564aa615f4e0a
2013-06-21 15:03:41 -07:00
kmccormick
f14ff1c9ce
Doc change: new Bluetooth LE doc
...
Change-Id: Ib6d67497a9b4d54d13b4da8f1f9ee991bc5ef562
2013-06-21 14:52:05 -07:00
John Spurlock
e539ee865f
Merge "Introduce SystemUI-managed alternative system bars."
2013-06-21 21:34:38 +00:00
John Spurlock
5c4541246c
Introduce SystemUI-managed alternative system bars.
...
If a service component is defined in a new secure setting,
SystemUI will attempt to use that service as the status bar
provider.
Falls back to the existing in-process implementation configured
in the product config if the setting is missing or invalid.
Nothing changes yet from a permission point of view. Alternative
system bar implementations still require the status bar permission.
Also nothing changes from an api point of view. Alternative
system bar implementations use the existing IStatusBar interface.
This simply enables testing alternative system bar implementations
installed from other trusted, platform-signed packages.
Known caveat: the setting is stored per user, multi-user changes
will be handled in a future CL.
Change-Id: I0413df185f7e75f77ad2ae1bc3689306d5e6e0fb
2013-06-21 17:31:25 -04:00
Romain Guy
4a7052a775
Merge "Safely dispose of the resize buffer"
2013-06-21 21:08:26 +00:00
Romain Guy
27e0bf6278
Safely dispose of the resize buffer
...
We just ensure there is a valid EGL context before
we destroy the associated layer.
2013-06-21 14:07:07 -07:00
Chris Craik
4f20f8ae50
Merge "Initialize MergingDrawBatch clip with viewport bounds"
2013-06-21 20:51:54 +00:00
Chris Craik
0e87f00f8c
Initialize MergingDrawBatch clip with viewport bounds
...
This allows merged, clipped operations to behave correctly within a
savelayer, even if the base viewport has a large offset.
Additionally, disregard opaqueness when within a
complexclip/savelayer, as the coverage can't be trusted.
Change-Id: Ic908b82a4bb410bc7fac1b4295f4874ed166efc5
2013-06-21 13:16:31 -07:00
Svetoslav Ganov
b06accf34f
Merge "Generate PDF from Canvas."
2013-06-21 20:09:51 +00:00
Wink Saville
142a29f45f
am ef8267c6: am 7334d25e: am 34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
...
* commit 'ef8267c6ad54eb4c8c00d3d36333fb12dd519588':
Fix misspelling of getLteSignalStrenght.
2013-06-21 12:17:57 -07:00
Wink Saville
ef8267c6ad
am 7334d25e: am 34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
...
* commit '7334d25e79d733b419aacfd706aad762f823f2f9':
Fix misspelling of getLteSignalStrenght.
2013-06-21 12:15:54 -07:00
Wink Saville
7334d25e79
am 34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
...
* commit '34fb4eae36bc926886149718672809a1ad43be97':
Fix misspelling of getLteSignalStrenght.
2013-06-21 12:12:24 -07:00
Wink Saville
34fb4eae36
Merge "Fix misspelling of getLteSignalStrenght."
2013-06-21 19:06:54 +00:00
The Android Open Source Project
cdd398b03a
am f05e2d25: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit 'f05e2d25372a47f5ff3b2d0c122d5ca8c3786238':
2013-06-21 11:58:23 -07:00
The Android Open Source Project
f05e2d2537
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: Id59401f35b9a467ddcc56c2167d6c30bb6c3d3e9
2013-06-21 11:56:57 -07:00
Romain Guy
64d592129e
Merge "Refcount the paint used by Canvas.drawPatch()"
2013-06-21 18:37:56 +00:00
Romain Guy
16ea8d373b
Refcount the paint used by Canvas.drawPatch()
...
Prevents crashes :)
Change-Id: I62103ce97490613142321f080b82c2edaed67a95
2013-06-21 11:35:52 -07:00
The Android Automerger
2ced32fbd1
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-21 11:35:45 -07:00
kmccormick
b38d53dacb
am 77caa0d0: am 42449d48: am da4a3f32: am 107e4830: am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '77caa0d0a7c0ca3e1729ee1d2ef597b60d73a1d9':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 11:27:02 -07:00
Dirk Dougherty
1a47dfb381
am 4366d982: am f542a8b2: am 0628e3fe: am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit '4366d982c203a91e0e52faa0a1f9c23f8c27e47b':
Doc change: add video for edu page.
2013-06-21 11:26:59 -07:00
kmccormick
77caa0d0a7
am 42449d48: am da4a3f32: am 107e4830: am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '42449d4842af545e76591d5aee8ee715b0d1a485':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 11:24:00 -07:00
Dirk Dougherty
4366d982c2
am f542a8b2: am 0628e3fe: am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit 'f542a8b2fecf74c5ae9eb2be08bcac36405e084a':
Doc change: add video for edu page.
2013-06-21 11:23:57 -07:00
kmccormick
42449d4842
am da4a3f32: am 107e4830: am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit 'da4a3f324b2944e3f088b67981ef30447a6fdeed':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 11:18:47 -07:00
kmccormick
da4a3f324b
am 107e4830: am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '107e48304516e810f0ecc20a540cce1bc25f252c':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 11:14:44 -07:00
Dirk Dougherty
f542a8b2fe
am 0628e3fe: am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit '0628e3fec9e75c960f8aed871afb26c021b1b2da':
Doc change: add video for edu page.
2013-06-21 11:11:11 -07:00
Dirk Dougherty
0628e3fec9
am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page.
...
* commit 'c496c2a8889f1b676bb48c77c81bf8d3f39ed3a1':
Doc change: add video for edu page.
2013-06-21 11:07:44 -07:00
kmccormick
107e483045
am 3f4759a0: am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '3f4759a0268860511ff844c59968843e2985d3ef':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 11:05:26 -07:00
kmccormick
3f4759a026
am 947857c1: am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
...
* commit '947857c11b9c50d97b9952bbbc29149680e7d4a3':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
2013-06-21 10:59:18 -07:00