Michael Wright
5e063d50f3
am 803029bb: Merge "Remove Rhodi keylayout" into lmp-dev
...
* commit '803029bb3c7f4972bee17fc6571dfa261e229cbb':
Remove Rhodi keylayout
2014-09-17 21:58:09 +00:00
Michael Wright
77ebdcbaaa
Merge "Remove Rhodi keylayout" into lmp-dev
2014-09-17 21:44:57 +00:00
John Reck
f98dc4f2e6
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:42:47 +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
a1a97a4c8d
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:07 +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
27abd85f5c
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:23 +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
329489abdd
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
f4a130fb62
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:27:32 +00:00
ztenghui
842731dfaf
am b20b6f24: Merge "Fix badge asset alpha issue" into lmp-dev
...
* commit 'b20b6f24c0b7426601d1ea62fc2013b6690ff05c':
Fix badge asset alpha issue
2014-09-17 19:27:28 +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
9213ab323b
am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
...
* commit 'bfd9a30f528dff00ae925a0e1f0ec18f669b3f1b':
NetworkStats always needs arrays.
2014-09-17 19:12:05 +00:00
Svetoslav
6cdeaaa291
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:44 +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
e0bb73718d
am d14816b6: Merge "Eliminate misleading warning." into lmp-dev
...
* commit 'd14816b6f33d8edbec43f5c226d50ed529daf19b':
Eliminate misleading warning.
2014-09-17 18:32:00 +00:00
Craig Mautner
f8c6ce7638
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:31:56 +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
2853267816
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:47:54 +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
0d336cccc4
am 446bd890: am 4243ec2a: am 9efd9f60: am fc95c477: docs: edu changes for launch
...
* commit '446bd8900b2c3b69d5440c893649a80981d75665':
docs: edu changes for launch
2014-09-17 17:20:05 +00:00
Andrew Solovay
7c4d93e818
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:20:01 +00:00
Chris Craik
ea3f59fd65
am b5a27aee: Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev
...
* commit 'b5a27aee532343a3c66d91c04c8d238ff35b31db':
Handle premultiplication correctly for ColorMatrixColorFilters
2014-09-17 17:12:21 +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
Craig Mautner
fabab90d1e
Eliminate misleading warning.
...
Remove token from deferred list of tokens to be removed once token
is removed. Leaving it in the list leads to logging messages like
"WindowManager: removeAppFromTaskLocked: token=AppWindowToken{...
} not found" when an attempt to remove it a second time fails.
Discovered in logs from b/17512377.
Change-Id: Ic83d81841b9b74ae5c4c433d1086d3bbda8e1d64
2014-09-17 09:34:30 -07:00
Jeff Sharkey
7a8f1a32dc
NetworkStats always needs arrays.
...
Internal logic relies on Arrays.copyOf(), so always give ourselves
valid arrays, using shared empty objects to save overhead.
Bug: 17502649
Change-Id: I5dbb00545bdfe45bbd48144ab505ea08cc92cbcd
2014-09-17 09:26:31 -07:00
Esteban Talavera
e3665b7bdf
am 62bdf3ea: Merge "Add \'adb dpm\' subcommand to set profile owner" into lmp-dev
...
* commit '62bdf3ea21de9b9d8ecada58eb1d7f7838b94e2f':
Add 'adb dpm' subcommand to set profile owner
2014-09-17 15:44:29 +00:00
Esteban Talavera
63b328bdeb
Merge "Add 'adb dpm' subcommand to set profile owner" into lmp-dev
2014-09-17 15:37:27 +00:00
Robert Ly
4243ec2a84
am 9efd9f60: am fc95c477: docs: edu changes for launch
...
* commit '9efd9f607006b3e02cda714901884e1ce22475d3':
docs: edu changes for launch
2014-09-17 15:33:16 +00:00
Robert Ly
9efd9f6070
am fc95c477: docs: edu changes for launch
...
* commit 'fc95c477835f86d99cf8c7ce5c1dd098fa42e69c':
docs: edu changes for launch
2014-09-17 15:19:15 +00:00
Robert Ly
fc95c47783
docs: edu changes for launch
...
Change-Id: Ia9047138bd9972e572b5dd93310339b630a2810d
2014-09-17 15:13:09 +00:00
Christoph Studer
fe12eaf06c
am c93c4fd9: Merge "SysUI: Add no-wallpaper recents theme for low GFX devices" into lmp-dev
...
* commit 'c93c4fd964680f49e4542c88ec6cdf4c7b925c91':
SysUI: Add no-wallpaper recents theme for low GFX devices
2014-09-17 14:56:17 +00:00
Christoph Studer
9077cbc30e
Merge "SysUI: Add no-wallpaper recents theme for low GFX devices" into lmp-dev
2014-09-17 14:17:33 +00:00
Alexandra Gherghina
38c6ef9624
am 5ec57688: Merge "Reorder user icon colors so that the first default is teal" into lmp-dev
...
* commit '5ec5768864e9a9dfc4dac4d0afe2f0593b070d08':
Reorder user icon colors so that the first default is teal
2014-09-17 12:01:27 +00:00
Alexandra Gherghina
16ebe98d9a
Merge "Reorder user icon colors so that the first default is teal" into lmp-dev
2014-09-17 11:49:29 +00:00
Christoph Studer
37e4468be1
SysUI: Add no-wallpaper recents theme for low GFX devices
...
Also add a config flag to control the theme to apply to RecentsActivity.
Bug: 17522143
Change-Id: I8d03e84e37b77698243673f6c4e676b2c53e0d07
2014-09-17 13:28:46 +02:00
Craig Mautner
63f10904a1
Add optimizations to keep TaskPersister queue small.
...
CTS tests cause the TaskPersister queue to fill faster than it can
drain. Since it contains screenshots this can consume massive
memory. Monkey may also cause the queue to back up.
Several optimizations are added to drain the queue when it gets
large:
- High water mark to recognize when queue gets too deep. Queue is
completely drained at this point so that obsolete files can be
removed from storage.
- Use Thread.yield() to give the TaskPersister write thread some cpu
cycles.
- Remove images from write queue when TaskRecord is removed from
recents.
May fix bug 17177273.
May fix bug 17381033.
Change-Id: If21c03c8f380e5f6816cf4701a40fcfe34ace3f1
2014-09-16 23:57:21 -07:00
Andrew Solovay
67267dcf90
am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
...
* commit '6c6664c95d7935398909e798e0aad451a2a83b1b':
Docs: Updated to include new Subscriptions functionality.
2014-09-17 06:12:12 +00:00
Andrew Solovay
6c6664c95d
am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
...
* commit 'a209406faa1f2b0f1dd7b6e3c5a468729f1c562f':
Docs: Updated to include new Subscriptions functionality.
2014-09-17 06:01:09 +00:00