OSDN Git Service
Baligh Uddin [Tue, 25 Jun 2013 00:20:56 +0000 (17:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7533d17db79b24818bb5870f2b6839ab233e110c
Auto-generated-cl: translation import
Craig Mautner [Mon, 24 Jun 2013 23:31:00 +0000 (23:31 +0000)]
Merge "When an app dies launch home conditionally."
Craig Mautner [Mon, 24 Jun 2013 23:19:55 +0000 (16:19 -0700)]
When an app dies launch home conditionally.
The determination for whether to launch home after an app dies
did not include whether the app would have returned home on exit.
This fixes that by checking what the app would naturally return to.
Fixes bug
9466261.
Change-Id: Ife6e895b9ef8c11b0a7f470d3eac4e88e763930b
Dianne Hackborn [Mon, 24 Jun 2013 23:02:02 +0000 (23:02 +0000)]
Merge "Improve FastPrintWriter."
Dianne Hackborn [Mon, 24 Jun 2013 22:54:52 +0000 (15:54 -0700)]
Improve FastPrintWriter.
Change-Id: I23acb8d4c3db1f2f8e2f8003296f8c253e2ae7d2
Selim Gurun [Mon, 24 Jun 2013 21:52:08 +0000 (21:52 +0000)]
Merge "Update cleanspec."
Selim Gurun [Mon, 24 Jun 2013 21:48:03 +0000 (14:48 -0700)]
Update cleanspec.
Update cleanspec to handle rename in I0df438e45ef540cc42c9ee5baafc816ebafa1c7b.
Change-Id: Ifc5abe794017d1dbc4a49c645751b71e3b08c0ef
John Spurlock [Mon, 24 Jun 2013 20:43:21 +0000 (20:43 +0000)]
Merge "Decouple recents from status bar."
John Spurlock [Mon, 24 Jun 2013 20:41:06 +0000 (20:41 +0000)]
Merge "Remove obsolete recents layout params."
Derek Sollenberger [Mon, 24 Jun 2013 19:54:57 +0000 (19:54 +0000)]
Merge "Fix SkASSERT errors resulting from the order objects are allocated on the stack."
Derek Sollenberger [Mon, 24 Jun 2013 19:40:54 +0000 (15:40 -0400)]
Fix SkASSERT errors resulting from the order objects are allocated
on the stack.
Change-Id: I24649fed5c069d8d3777d153e8fb31a55a9cf7a1
Craig Mautner [Mon, 24 Jun 2013 19:25:57 +0000 (12:25 -0700)]
Fix build.
Change-Id: Icdfc6bcbe8603cf9bd3f8982a595336c0407e7d6
Craig Mautner [Mon, 24 Jun 2013 18:38:10 +0000 (18:38 +0000)]
Merge "Fix unnecessary and harmful task movement."
Svetoslav [Mon, 24 Jun 2013 18:34:33 +0000 (18:34 +0000)]
Merge "Print APIs documentation update"
Craig Mautner [Mon, 24 Jun 2013 18:31:54 +0000 (18:31 +0000)]
Merge "Add activity token to display system."
John Spurlock [Mon, 24 Jun 2013 17:06:08 +0000 (13:06 -0400)]
Decouple recents from status bar.
Remove remaining references to recents package from status bar.
Introduce in-process "components" to the existing SystemUI base class
to make component boundaries explicit, and implement Recents as the
first component.
Change-Id: Ieefd386379a1f46806b31f68a4cacd76c093aea4
Craig Mautner [Mon, 24 Jun 2013 18:21:57 +0000 (11:21 -0700)]
Fix unnecessary and harmful task movement.
Changing the focus to a new activity should not move it to the top of
the task stack. When the previous activity fully pauses and the new
focused activity resumes then it will be brought to the top of the
task stack at the proper time. Moving it there prematurely causes the
ActivityManager and WindowManager stack sequences to be out of sync.
Fixes bug
9518153.
Also remove false warnings in validateTopActivitiesLocked() and add
debug for task movement to TaskStack.
Change-Id: Ib57500b07ded97223155cda7ef603aecc9b642c3
Andy McFadden [Mon, 24 Jun 2013 17:42:25 +0000 (17:42 +0000)]
Merge "Fix wrapper equals()"
Alan Viverette [Mon, 24 Jun 2013 17:23:19 +0000 (17:23 +0000)]
Merge "Implement FastScroller as an animated overlay."
Chet Haase [Mon, 24 Jun 2013 16:37:54 +0000 (16:37 +0000)]
Merge "Fix ViewGroupOverlay's handling of invalidating viewgroups"
Svetoslav [Mon, 24 Jun 2013 16:04:48 +0000 (09:04 -0700)]
Print APIs documentation update
Change-Id: I0df438e45ef540cc42c9ee5baafc816ebafa1c7b
John Spurlock [Mon, 24 Jun 2013 15:32:48 +0000 (11:32 -0400)]
Remove obsolete recents layout params.
Change-Id: I20d12a63f4449ba73911cbe219446f3d1cd089e9
Andy McFadden [Mon, 24 Jun 2013 14:26:18 +0000 (14:26 +0000)]
Merge "Minor fixes to android.opengl.Matrix"
Dirk Dougherty [Mon, 24 Jun 2013 08:47:41 +0000 (01:47 -0700)]
am
66e9a009: am
d73e151e: am
3d1c9b07: am
eadad05c: am
d8dff038: am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
66e9a009771c7e7a4fb48ba872b87009758f6d51':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:45:36 +0000 (01:45 -0700)]
am
d73e151e: am
3d1c9b07: am
eadad05c: am
d8dff038: am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
d73e151eaca8615015948d535d90397c8719c5f4':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:42:27 +0000 (01:42 -0700)]
am
3d1c9b07: am
eadad05c: am
d8dff038: am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
3d1c9b0710efa265e1ead34ee48a487c5ad4f66f':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:39:52 +0000 (01:39 -0700)]
am
eadad05c: am
d8dff038: am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
eadad05c341b418cfe6249fb16d91951a3432c8a':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:37:52 +0000 (01:37 -0700)]
am
d8dff038: am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
d8dff038f9368decd5a9e1176e453a24e4309290':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:34:48 +0000 (01:34 -0700)]
am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
1c77f5e2757e589bfc8c1e89e6394504f576ac52':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:32:54 +0000 (01:32 -0700)]
am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
1c1113958d4e27018b02ce793809d541158440f6':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:30:58 +0000 (01:30 -0700)]
am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
8451fc4f8660842b21e4ed3bddaedb0eb9490855':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 07:30:38 +0000 (00:30 -0700)]
Doc change: edits to education opt-in docs.
Change-Id: I258a8f89c3bdbb6b5dabfe96cc7dd66dd16b8052
Dirk Dougherty [Mon, 24 Jun 2013 05:36:05 +0000 (22:36 -0700)]
am
0d4adbe0: am
0efa541a: am
6561c275: am
6755a4d4: am
757b943a: am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
0d4adbe0a3ba69ddc348cf086b2357cf27ff10d6':
Doc change: add docs for edu opt-in.
Craig Mautner [Mon, 24 Jun 2013 04:24:13 +0000 (21:24 -0700)]
Don't move stack with task for moveTaskToFront.
Earlier CL, ag/321609, was overly aggressive. It should only have kept
the stack from moving when moveTaskToStack() was called. Instead the
change was applied to moveTaskToFront() as well. In order to remain
consistent with earlier behavior of moveTaskToFront() the stack
containing the task must move to the front as well. This movement
launches the activity at the top of the task. Without the stack
movement the activity never gets launched causing bug
9498455.
Fixes bug
9498455.
Change-Id: I2cb9119c23a226f7d211851df9e49f10f702b3ef
Dirk Dougherty [Mon, 24 Jun 2013 02:53:00 +0000 (19:53 -0700)]
am
0efa541a: am
6561c275: am
6755a4d4: am
757b943a: am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
0efa541a0156396290e03c82c8b28326380c9e4a':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:50:32 +0000 (19:50 -0700)]
am
6561c275: am
6755a4d4: am
757b943a: am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
6561c27519d710e79a7b2d15e29fcccb2f714c94':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:45:02 +0000 (19:45 -0700)]
am
6755a4d4: am
757b943a: am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
6755a4d433d44506abd932b62f6552fa37bf1dd9':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:42:58 +0000 (19:42 -0700)]
am
757b943a: am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
757b943a92d23c255dcca15944908f105265a86b':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:41:29 +0000 (19:41 -0700)]
am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
b2e3fb4f37e6cf0e2c9e3aa00facfac9fbd4e22d':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:39:30 +0000 (19:39 -0700)]
am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
9db291583a90babbcb6db6f2b82276f5657a3503':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:37:14 +0000 (19:37 -0700)]
am
f812258e: Doc change: add docs for edu opt-in.
* commit '
f812258e5ca9449402781a7330c0e3696f566e09':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 00:33:15 +0000 (17:33 -0700)]
Doc change: add docs for edu opt-in.
Change-Id: Ieb9f77e3efd64c42c719167dd6e6c6d7360bcfa4
Craig Mautner [Tue, 11 Jun 2013 14:53:06 +0000 (07:53 -0700)]
Add activity token to display system.
First step in adding activity specific information to displays.
Replace CompatibilityInfoHolder with DisplayAdjustmentsHolder that
holds an activity token in addition to the CompatibilityInfo.
Change-Id: Ie113cd8dd9c62e0b5311204e039a4829096bea68
Svetoslav [Sat, 22 Jun 2013 07:26:49 +0000 (00:26 -0700)]
Print API tweaks.
Change-Id: I4fcf93f17495740e8b8d0dc4e425a89862716b42
Scott Main [Sat, 22 Jun 2013 04:02:37 +0000 (21:02 -0700)]
am
83006f51: am
aa837ded: am
86c9d47c: update homepage carousel for jelly bean 3.0
* commit '
83006f5197f9acd999b9ab5c38d0ec6342787cfb':
update homepage carousel for jelly bean 3.0
Scott Main [Sat, 22 Jun 2013 03:51:37 +0000 (20:51 -0700)]
am
aa837ded: am
86c9d47c: update homepage carousel for jelly bean 3.0
* commit '
aa837dedf85eabde76cf8d5ec57e42f78832e8a6':
update homepage carousel for jelly bean 3.0
Scott Main [Sat, 22 Jun 2013 03:48:32 +0000 (20:48 -0700)]
Scott Main [Sat, 22 Jun 2013 03:44:39 +0000 (20:44 -0700)]
am
86c9d47c: update homepage carousel for jelly bean 3.0
* commit '
86c9d47cb7a1e2b3868e0152f1df9ef335555f52':
update homepage carousel for jelly bean 3.0
Scott Main [Sat, 22 Jun 2013 03:39:41 +0000 (20:39 -0700)]
update homepage carousel for jelly bean 3.0
Change-Id: Ie698493e4da0232b67630f92e80bf025be24884a
Scott Main [Sat, 22 Jun 2013 03:33:24 +0000 (20:33 -0700)]
am
c2d92db8: am
bcd6f76a: Merge "typo" into jb-mr2-dev
* commit '
c2d92db8c0ca3d9d045f5f710f4d90db8684b439':
typo
Scott Main [Sat, 22 Jun 2013 03:32:35 +0000 (20:32 -0700)]
am
73c1882f: am
90e2e8db: am
4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev
* commit '
73c1882fd8243ded351c453c98d2b8c6fba7dba8':
add jb-mr2 api overview
Scott Main [Sat, 22 Jun 2013 03:30:12 +0000 (20:30 -0700)]
am
bcd6f76a: Merge "typo" into jb-mr2-dev
* commit '
bcd6f76ac9ebcf1745f1cfce975d8e9835cd4bab':
typo
Scott Main [Sat, 22 Jun 2013 03:28:09 +0000 (20:28 -0700)]
am
90e2e8db: am
4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev
* commit '
90e2e8db2f74b25cff0cfe7e59f88a37d49da3a8':
add jb-mr2 api overview
Scott Main [Sat, 22 Jun 2013 03:26:26 +0000 (03:26 +0000)]
Merge "typo" into jb-mr2-dev
Scott Main [Sat, 22 Jun 2013 03:25:45 +0000 (20:25 -0700)]
am
4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev
* commit '
4129cfe1e4abf2366e395f36804a866b13241d28':
add jb-mr2 api overview
Scott Main [Sat, 22 Jun 2013 03:25:23 +0000 (20:25 -0700)]
typo
Change-Id: I4dcb7c67313a8e3f42ae9f56e4c0ce6e5874dfc7
Scott Main [Sat, 22 Jun 2013 03:23:50 +0000 (03:23 +0000)]
Merge "add jb-mr2 api overview" into jb-mr2-dev
Scott Main [Sat, 15 Jun 2013 01:01:10 +0000 (18:01 -0700)]
add jb-mr2 api overview
Change-Id: Ib46c3ad3318d19927f47f1bb0ada93adf7766147
Svetoslav Ganov [Sat, 22 Jun 2013 01:44:34 +0000 (01:44 +0000)]
Merge "Print - platform APIs"
Svetoslav Ganov [Tue, 11 Jun 2013 22:20:06 +0000 (15:20 -0700)]
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
Chet Haase [Sat, 22 Jun 2013 00:49:36 +0000 (17:49 -0700)]
Fix ViewGroupOverlay's handling of invalidating viewgroups
Invalidating a view property (alpha, rotation, etc.) causes an
invalidation process that does not work correctly when the view is
in a ViewOverlay. Specifically, if the view is not directly in the
overlay, but is instead inside a hierarchy which is within the overlay,
then the invalidation process stops at the ViewOverlay itself, because
the ViewOverlay has no "parent" view.
The fix is to override the invalidateChildInParentFast() method, just
like we override invalidateChildInParent(), to forward the invalidation
to the host view.
Issue #
9389230 Animations not running for nested views under ViewGroupOverlay
Change-Id: I03fcef10ed1c8a91cb26d5d9d6945634b0b695b5
Geremy Condra [Sat, 22 Jun 2013 00:41:52 +0000 (00:41 +0000)]
Merge "Remove logging of KeySet parse errors."
Alan Viverette [Sat, 22 Jun 2013 00:01:36 +0000 (17:01 -0700)]
Implement FastScroller as an animated overlay.
Bug:
9372090
Change-Id: I46cb67ef0482a4c8f721248d5f5e2e692144c3a1
Geremy Condra [Fri, 21 Jun 2013 23:59:42 +0000 (16:59 -0700)]
Remove logging of KeySet parse errors.
Bug:
9532748
Change-Id: I3cce41de74783a121d2cd4f7b0ea6dfa03e3d7c5
Dianne Hackborn [Fri, 21 Jun 2013 23:49:07 +0000 (23:49 +0000)]
Merge "Faster PrintWriter."
Romain Guy [Fri, 21 Jun 2013 23:44:32 +0000 (23:44 +0000)]
Merge "When destroying a surface, only unmake current if necessary Bug #
9404946"
Romain Guy [Fri, 21 Jun 2013 23:40:30 +0000 (16:40 -0700)]
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
kmccormick [Fri, 21 Jun 2013 23:34:40 +0000 (16:34 -0700)]
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
kmccormick [Fri, 21 Jun 2013 23:31:41 +0000 (16:31 -0700)]
am
75c59fb9: am
dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
* commit '
75c59fb9d9a1408146165300eae0899a965897bf':
Doc change: new Bluetooth LE doc
Jim Miller [Fri, 21 Jun 2013 23:29:29 +0000 (23:29 +0000)]
Merge "Fix alpha animation bug in keyguard"
kmccormick [Fri, 21 Jun 2013 23:29:23 +0000 (16:29 -0700)]
am
dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
* commit '
dc22fa924a6df52fb6ad97aa63150c815a2f047f':
Doc change: new Bluetooth LE doc
Andy McFadden [Fri, 21 Jun 2013 23:21:05 +0000 (16:21 -0700)]
Fix wrapper equals()
Make it faster and correcter.
Bug
9204146
Change-Id: Ieeb97b72005e831ec6b94fc24ed2c3bc03307c2a
Chet Haase [Fri, 21 Jun 2013 22:00:05 +0000 (15:00 -0700)]
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
Dianne Hackborn [Tue, 2 Apr 2013 00:28:16 +0000 (17:28 -0700)]
Faster PrintWriter.
Change-Id: I4e1ae7e0357214deb7e19ae65f8701b69b347c6e
kmccormick [Fri, 21 Jun 2013 23:00:18 +0000 (23:00 +0000)]
Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
Michael Wright [Fri, 21 Jun 2013 22:26:36 +0000 (22:26 +0000)]
Merge "Paint current points a different color in PointerLocation"
Michael Wright [Fri, 21 Jun 2013 22:18:06 +0000 (15:18 -0700)]
Paint current points a different color in PointerLocation
Change-Id: I05be4ce1886f944cd948ded4d9ace08d70cdb00e
Dianne Hackborn [Fri, 21 Jun 2013 22:06:27 +0000 (22:06 +0000)]
Merge "More procstats work: separate global proc account, more dumping."
Dianne Hackborn [Fri, 21 Jun 2013 01:59:11 +0000 (18:59 -0700)]
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
kmccormick [Thu, 6 Jun 2013 18:14:57 +0000 (11:14 -0700)]
Doc change: new Bluetooth LE doc
Change-Id: Ib6d67497a9b4d54d13b4da8f1f9ee991bc5ef562
Andy McFadden [Fri, 21 Jun 2013 21:43:19 +0000 (14:43 -0700)]
Minor fixes to android.opengl.Matrix
This has a minor API change: deprecation of the nullary constructor.
The class is entirely composed of static methods, and was written
without a constructor, but the compiler dutifully generated a
default implementation and the API tool slurped it up.
The other changes are to the documentation:
- Added warnings about the use of overlapping input and output
on certain methods.
- Fixed a few inaccuracies (e.g. transposeM() returns a transposed
matrix, not an inverted matrix).
- Tidied up the formatting.
- Generally placated the consistency hobgoblins.
Bug
8868762
Change-Id: Ie3f86b98c477d8dc82d9dcaa311959bd4d191359
John Spurlock [Fri, 21 Jun 2013 21:34:38 +0000 (21:34 +0000)]
Merge "Introduce SystemUI-managed alternative system bars."
John Spurlock [Mon, 17 Jun 2013 11:35:46 +0000 (07:35 -0400)]
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
Romain Guy [Fri, 21 Jun 2013 21:08:26 +0000 (21:08 +0000)]
Merge "Safely dispose of the resize buffer"
Romain Guy [Fri, 21 Jun 2013 21:07:07 +0000 (14:07 -0700)]
Safely dispose of the resize buffer
We just ensure there is a valid EGL context before
we destroy the associated layer.
Chris Craik [Fri, 21 Jun 2013 20:51:54 +0000 (20:51 +0000)]
Merge "Initialize MergingDrawBatch clip with viewport bounds"
Chris Craik [Wed, 19 Jun 2013 23:54:59 +0000 (16:54 -0700)]
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
Svetoslav Ganov [Fri, 21 Jun 2013 20:09:50 +0000 (20:09 +0000)]
Merge "Generate PDF from Canvas."
Wink Saville [Fri, 21 Jun 2013 19:17:57 +0000 (12:17 -0700)]
am
ef8267c6: am
7334d25e: am
34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
* commit '
ef8267c6ad54eb4c8c00d3d36333fb12dd519588':
Fix misspelling of getLteSignalStrenght.
Wink Saville [Fri, 21 Jun 2013 19:15:54 +0000 (12:15 -0700)]
am
7334d25e: am
34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
* commit '
7334d25e79d733b419aacfd706aad762f823f2f9':
Fix misspelling of getLteSignalStrenght.
Wink Saville [Fri, 21 Jun 2013 19:12:24 +0000 (12:12 -0700)]
am
34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
* commit '
34fb4eae36bc926886149718672809a1ad43be97':
Fix misspelling of getLteSignalStrenght.
Wink Saville [Fri, 21 Jun 2013 19:06:54 +0000 (19:06 +0000)]
Merge "Fix misspelling of getLteSignalStrenght."
The Android Open Source Project [Fri, 21 Jun 2013 18:58:23 +0000 (11:58 -0700)]
am
f05e2d25: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
f05e2d25372a47f5ff3b2d0c122d5ca8c3786238':
The Android Open Source Project [Fri, 21 Jun 2013 18:56:57 +0000 (11:56 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id59401f35b9a467ddcc56c2167d6c30bb6c3d3e9
Romain Guy [Fri, 21 Jun 2013 18:37:56 +0000 (18:37 +0000)]
Merge "Refcount the paint used by Canvas.drawPatch()"
Romain Guy [Fri, 21 Jun 2013 18:35:52 +0000 (11:35 -0700)]
Refcount the paint used by Canvas.drawPatch()
Prevents crashes :)
Change-Id: I62103ce97490613142321f080b82c2edaed67a95
The Android Automerger [Fri, 21 Jun 2013 18:35:45 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
kmccormick [Fri, 21 Jun 2013 18:27:02 +0000 (11:27 -0700)]
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
Dirk Dougherty [Fri, 21 Jun 2013 18:26:59 +0000 (11:26 -0700)]
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.
kmccormick [Fri, 21 Jun 2013 18:24:00 +0000 (11:24 -0700)]
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