Commit Graph

156314 Commits

Author SHA1 Message Date
Michael Wright
a245bea2c1 am 2b9d0f5e: am 803029bb: Merge "Remove Rhodi keylayout" into lmp-dev
* commit '2b9d0f5e4f5ce83a10eee9800d154d782699e06b':
  Remove Rhodi keylayout
2014-09-17 22:06:16 +00:00
Michael Wright
dada0f22e7 am 803029bb: Merge "Remove Rhodi keylayout" into lmp-dev
* commit '803029bb3c7f4972bee17fc6571dfa261e229cbb':
  Remove Rhodi keylayout
2014-09-17 21:58:08 +00:00
John Reck
6101f8bcfc am d0738f9c: am 8523ad90: Merge "Change default fbo cache size to 0" into lmp-dev
* commit 'd0738f9c1e049ebd881ea9c5fb93076e0aeb81cc':
  Change default fbo cache size to 0
2014-09-17 21:54:54 +00:00
Michael Wright
77ebdcbaaa Merge "Remove Rhodi keylayout" into lmp-dev 2014-09-17 21:44:57 +00:00
David Christie
6c65c49f31 am ef52db95: am b2e91428: Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev
* commit 'ef52db9536b0aef77a1543ca3a97a4ad43a70e9a':
  Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515
2014-09-17 21:43:50 +00:00
John Reck
3acd14a192 am 8523ad90: Merge "Change default fbo cache size to 0" into lmp-dev
* commit '8523ad90bbbdee595ca302e775f0cf3ff8c41424':
  Change default fbo cache size to 0
2014-09-17 21:43:02 +00:00
John Reck
5083943ff8 Merge "Change default fbo cache size to 0" into lmp-dev 2014-09-17 21:35:02 +00:00
David Christie
709aecb3ac am b2e91428: Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev
* commit 'b2e914287fc6a7cc4894ea67ec527830c53f0039':
  Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515
2014-09-17 21:31:03 +00:00
Yigit Boyar
8424665e0e am 777f6c3c: am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev
* commit '777f6c3c846a4a6722664cf119f6b8959b9db6f0':
  Handle action mode changes properly for actionbar tabs
2014-09-17 21:22:02 +00:00
David Christie
61ee1eda0a Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev 2014-09-17 21:20:27 +00:00
John Reck
e9cd97ee88 Change default fbo cache size to 0
Bug: 17479800

 FBO cache is very expensive and no longer necessary, disable
 it by just setting size to 0.

Change-Id: I664616f262c8339919e1d20baaafa5de2b628d7e
2014-09-17 14:09:26 -07:00
Yigit Boyar
658864a610 am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev
* commit '7fa36f26c6705346e41f81f6d3f2f8a22dd3b42c':
  Handle action mode changes properly for actionbar tabs
2014-09-17 21:08:28 +00:00
Yigit Boyar
fd20f196b1 Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev 2014-09-17 21:00:40 +00:00
Sandeep Siddhartha
67032ce76a am 9364b830: am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev
* commit '9364b830a4d78a3c76cc7eacc71c9b7808fd414b':
  Fix issues with multiple languages and multi-users
2014-09-17 20:33:17 +00:00
Sandeep Siddhartha
bef8265f41 am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev
* commit 'e80c6f17079155855aa11eae47b619af0ebb591c':
  Fix issues with multiple languages and multi-users
2014-09-17 20:21:05 +00:00
Sandeep Siddhartha
80ea66b102 Merge "Fix issues with multiple languages and multi-users" into lmp-dev 2014-09-17 20:06:43 +00:00
Alan Viverette
0205ad9c8b am 73e4d122: am f0ea4ce6: Merge "Revert body font size to 14sp, fix ActionBar menu text color" into lmp-dev
* commit '73e4d1226366aa7c481ee6fb950e6a1c8d11e530':
  Revert body font size to 14sp, fix ActionBar menu text color
2014-09-17 19:38:15 +00:00
ztenghui
00c86ea560 am 570994b9: am b20b6f24: Merge "Fix badge asset alpha issue" into lmp-dev
* commit '570994b926b8cc094d69467db113aee51dd45405':
  Fix badge asset alpha issue
2014-09-17 19:38:11 +00:00
Alan Viverette
c5d41884a1 am f0ea4ce6: Merge "Revert body font size to 14sp, fix ActionBar menu text color" into lmp-dev
* commit 'f0ea4ce63510be154cbf737a3ed60deb0cbd5289':
  Revert body font size to 14sp, fix ActionBar menu text color
2014-09-17 19:28:09 +00:00
ztenghui
0461b80018 am b20b6f24: Merge "Fix badge asset alpha issue" into lmp-dev
* commit 'b20b6f24c0b7426601d1ea62fc2013b6690ff05c':
  Fix badge asset alpha issue
2014-09-17 19:28:04 +00:00
Jeff Sharkey
c86a48ffb9 am 51420c63: am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
* commit '51420c63918de8db44084b04c155448c3fd25362':
  NetworkStats always needs arrays.
2014-09-17 19:25:08 +00:00
Alan Viverette
ae1990f406 Merge "Revert body font size to 14sp, fix ActionBar menu text color" into lmp-dev 2014-09-17 19:20:33 +00:00
Alan Viverette
59b2d80f88 Revert body font size to 14sp, fix ActionBar menu text color
BUG: 17549070
BUG: 17538527
Change-Id: Id4d412ae3c035c6f76ae10569658a0d97e36a0e8
2014-09-17 12:19:56 -07:00
ztenghui
d25e864dde Merge "Fix badge asset alpha issue" into lmp-dev 2014-09-17 19:17:25 +00:00
Jeff Sharkey
4a01d8f4e0 am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
* commit 'bfd9a30f528dff00ae925a0e1f0ec18f669b3f1b':
  NetworkStats always needs arrays.
2014-09-17 19:12:18 +00:00
Svetoslav
b876d8f967 am 1110de7b: am 84ad5f75: Merge "Page content sometimes disappears when scrolling a long doc in print preview." into lmp-dev
* commit '1110de7ba8adae49fa54b3b07580cb0fb8901d0a':
  Page content sometimes disappears when scrolling a long doc in print preview.
2014-09-17 19:12:12 +00:00
Svetoslav
f58fe2518e am 84ad5f75: Merge "Page content sometimes disappears when scrolling a long doc in print preview." into lmp-dev
* commit '84ad5f75e1c7d4f4d5113b413e814bde3aaa1747':
  Page content sometimes disappears when scrolling a long doc in print preview.
2014-09-17 19:03:52 +00:00
Jeff Sharkey
9d375ecbe6 Merge "NetworkStats always needs arrays." into lmp-dev 2014-09-17 19:01:13 +00:00
Svetoslav
a732950ade Merge "Page content sometimes disappears when scrolling a long doc in print preview." into lmp-dev 2014-09-17 18:52:19 +00:00
Craig Mautner
9a0ae4dbae am c5e37f83: am d14816b6: Merge "Eliminate misleading warning." into lmp-dev
* commit 'c5e37f83e27b2c42bac9ba047a2d6818cc11c70a':
  Eliminate misleading warning.
2014-09-17 18:45:49 +00:00
Craig Mautner
a6c7883bba am 3b13820d: am 951df81d: Merge "Add optimizations to keep TaskPersister queue small." into lmp-dev
* commit '3b13820d6f5602bec44b8a131bfad39e35e79d79':
  Add optimizations to keep TaskPersister queue small.
2014-09-17 18:45:44 +00:00
Sailesh Nepal
a7aca2c916 am 40c4c3eb: am 86f939e8: Merge "Include code when converting unknown causes to string" into lmp-dev
* commit '40c4c3eb7a30d875432515fa5e642e041832e5f1':
  Include code when converting unknown causes to string
2014-09-17 18:32:20 +00:00
Craig Mautner
e539864418 am d14816b6: Merge "Eliminate misleading warning." into lmp-dev
* commit 'd14816b6f33d8edbec43f5c226d50ed529daf19b':
  Eliminate misleading warning.
2014-09-17 18:31:02 +00:00
Craig Mautner
698eb0f7e9 am 951df81d: Merge "Add optimizations to keep TaskPersister queue small." into lmp-dev
* commit '951df81d02a9ed21c9e3cb0e81b0ebf9b08a527c':
  Add optimizations to keep TaskPersister queue small.
2014-09-17 18:30:57 +00:00
ztenghui
45fb8735b2 Fix badge asset alpha issue
b/17544362

Change-Id: Ibf22918ccfebe082a25f28f0d4c1991e700a1fd2
2014-09-17 11:24:04 -07:00
Svetoslav
7fd5ada98a Page content sometimes disappears when scrolling a long doc in print preview.
The operations of the remote renderer have to be performed in order, open,
render some pages, close. One of the tasks was executed on the wrong executor
resuling in a race and an occassional bad state.

Also fixed a NPE if the preview list is flinged and then the user presses
back.

bug:17537922

Change-Id: I5048078ba2b875a2a8335f3a4324afaa34d014a2
2014-09-17 11:11:08 -07:00
Craig Mautner
36e793c73b Merge "Eliminate misleading warning." into lmp-dev 2014-09-17 18:02:44 +00:00
Craig Mautner
941aa1afe3 Merge "Add optimizations to keep TaskPersister queue small." into lmp-dev 2014-09-17 18:01:46 +00:00
Sailesh Nepal
f7e641566f am 86f939e8: Merge "Include code when converting unknown causes to string" into lmp-dev
* commit '86f939e832c257b5fa2606aed00e9dfaeaef90cd':
  Include code when converting unknown causes to string
2014-09-17 17:48:32 +00:00
Sailesh Nepal
b181492258 Merge "Include code when converting unknown causes to string" into lmp-dev 2014-09-17 17:33:11 +00:00
Robert Ly
2df91b775a am 418cfad1: am 446bd890: am 4243ec2a: am 9efd9f60: am fc95c477: docs: edu changes for launch
* commit '418cfad1de153c161d6abc830dd762f939cab257':
  docs: edu changes for launch
2014-09-17 17:27:18 +00:00
Andrew Solovay
e8237c4da0 am 1e36696f: am 37fce2bc: am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
* commit '1e36696facbc54e90b69e44779fcf25052594139':
  Docs: Updated to include new Subscriptions functionality.
2014-09-17 17:27:07 +00:00
Chris Craik
cd4f28e999 am befbdaba: am b5a27aee: Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev
* commit 'befbdaba72a2c1502ff6135a8214f7434a6b2ea7':
  Handle premultiplication correctly for ColorMatrixColorFilters
2014-09-17 17:27:02 +00:00
Robert Ly
0cb7ba5e68 am 446bd890: am 4243ec2a: am 9efd9f60: am fc95c477: docs: edu changes for launch
* commit '446bd8900b2c3b69d5440c893649a80981d75665':
  docs: edu changes for launch
2014-09-17 17:17:16 +00:00
Andrew Solovay
e37aa3612b am 37fce2bc: am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
* commit '37fce2bca37c59ee4c733a6ced3c5be48c77aef6':
  Docs: Updated to include new Subscriptions functionality.
2014-09-17 17:17:02 +00:00
Chris Craik
4e458aca82 am b5a27aee: Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev
* commit 'b5a27aee532343a3c66d91c04c8d238ff35b31db':
  Handle premultiplication correctly for ColorMatrixColorFilters
2014-09-17 17:11:00 +00:00
Robert Ly
5b75935416 am 4243ec2a: am 9efd9f60: am fc95c477: docs: edu changes for launch
* commit '4243ec2a84e9e42237e8e5bfd5cfb675f765d84f':
  docs: edu changes for launch
2014-09-17 17:10:01 +00:00
Andrew Solovay
b1c066fa5c am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
* commit '67267dcf909e080ea3adf902c8a9df115bd1b279':
  Docs: Updated to include new Subscriptions functionality.
2014-09-17 17:09:46 +00:00
Chris Craik
ba9d58516c Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev 2014-09-17 17:01:35 +00:00
Chris Craik
73821c8d2b Handle premultiplication correctly for ColorMatrixColorFilters
bug:17405627

Previously, the input content to the color matrix computation was left
premultiplied. Since the color matrix could reduce the alpha channel,
the alpha was re-multiplied, but this was incomplete, and incorrect.

Instead, apply the color matrix in unpremultiplied space.

Change-Id: I87b8e03d2e228e6ded81f7bbfea952605d7a095c
2014-09-17 10:00:34 -07:00