Christopher Tate
b0f1614579
am 887ad9b6: Merge "Automatically bind to newly-installed backup transports" into lmp-dev
...
* commit '887ad9b66a2e1c425fac4aeec7b1a773d4394a35':
Automatically bind to newly-installed backup transports
2014-08-22 21:14:17 +00:00
Adam Lesinski
e90d91ce5b
am f064f669: Merge "AAPT: Dump installLocation in badging" into lmp-dev
...
* commit 'f064f6691c5bc415fc5123b7219e3465f3901e20':
AAPT: Dump installLocation in badging
2014-08-22 21:14:13 +00:00
Amith Yamasani
dbca3c3121
am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev
...
* commit '654d72fd3c12bf0470e88debb0701a949914607e':
Show a user switching dialog before starting the user switch
2014-08-22 21:14:10 +00:00
Matthew Williams
e7faa446a9
am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev
...
* commit 'd95fb7b383bf7534ddcaea4aeb76fb00e1f6e7be':
JobScheduler only run jobs for started users.
2014-08-22 21:14:05 +00:00
Svetoslav
b5a5235115
am dafdc643: Merge "Fix jank in when drawing magnification bounds" into lmp-dev
...
* commit 'dafdc6439f4a8cde3f1b29a94fc6b8c5c47cf6ed':
Fix jank in when drawing magnification bounds
2014-08-22 21:14:01 +00:00
ztenghui
07695e87e6
am 2758bafd: Merge "Improve the spot shadow computation." into lmp-dev
...
* commit '2758bafd337abdc6a7873ce57185cf130d93dfb7':
Improve the spot shadow computation.
2014-08-22 21:13:56 +00:00
Christopher Tate
e7bbe47833
Merge "Automatically bind to newly-installed backup transports" into lmp-dev
2014-08-22 21:11:41 +00:00
Adam Lesinski
37e6cbae59
Merge "AAPT: Dump installLocation in badging" into lmp-dev
2014-08-22 21:09:00 +00:00
Amith Yamasani
6dd08fdd91
Merge "Show a user switching dialog before starting the user switch" into lmp-dev
2014-08-22 21:08:15 +00:00
Matthew Williams
12eec2341d
Merge "JobScheduler only run jobs for started users." into lmp-dev
2014-08-22 21:08:06 +00:00
Svetoslav
d9a218d499
Merge "Fix jank in when drawing magnification bounds" into lmp-dev
2014-08-22 21:07:09 +00:00
ztenghui
190ead730f
Merge "Improve the spot shadow computation." into lmp-dev
2014-08-22 21:04:49 +00:00
Elliott Hughes
0b3d2d01d3
am 97352608: Merge "Don\'t show the pseudolocales unless we\'re in developer mode." into lmp-dev
...
* commit '973526087efda830993a1f17a588d62930ce4520':
Don't show the pseudolocales unless we're in developer mode.
2014-08-22 20:54:45 +00:00
ztenghui
c50a03d78a
Improve the spot shadow computation.
...
Get rid of compuation of the intersection for penumbra and convex hull for umbra.
Use simple circle / normal to compute the penumbra and simple intersection for umbra.
The new way could be 2x to 4x faster from rectangle to round shape.
And this part is roughly half of the shadow computation, or 2/3 of spot shadow
computation.
This improve the spot shadow spikeness too.
b/16712006
b/14976551
Change-Id: I02911784868731369efa73f76fc915bc08248600
2014-08-22 13:51:16 -07:00
Elliott Hughes
5d04fee900
Merge "Don't show the pseudolocales unless we're in developer mode." into lmp-dev
2014-08-22 20:42:19 +00:00
giseok.seo
68a10d0dc6
am 7717d9ce: Use proper ril.ecclist when no sim state
...
* commit '7717d9ce09801167a43b6932f76bc9e1b17bb7b9':
Use proper ril.ecclist when no sim state
2014-08-22 20:34:29 +00:00
Christopher Tate
5684dae9cc
Automatically bind to newly-installed backup transports
...
They'll be rebound automatically at boot, but need to be brought
up immediately. As always they can only be provided by privileged
apps.
Bug 16542048
Change-Id: I9f121a5c111a772deb3f0c44166002a2cbb16ad5
2014-08-22 13:29:46 -07:00
ztenghui
c3bd97fcb5
am 5467ca37: Merge "Fixing AVD animation with startOffset" into lmp-dev
...
* commit '5467ca377867fcfbe2066a8f087ae407713f42b1':
Fixing AVD animation with startOffset
2014-08-22 20:28:59 +00:00
John Reck
1f5e141950
am 673b5523: Merge "Revert immutable Shader change" into lmp-dev
...
* commit '673b5523f56abff839169b0da963b24015e4f061':
Revert immutable Shader change
2014-08-22 20:28:54 +00:00
giseok.seo
83749f3479
Use proper ril.ecclist when no sim state
...
Bug: 17139446
Signed-off-by: giseok.seo <giseok.seo@lge.com>
Change-Id: I2f420973b29092b8a6cceb8cf4bd77d0ee8372bd
2014-08-22 20:27:20 +00:00
ztenghui
a94900e587
Merge "Fixing AVD animation with startOffset" into lmp-dev
2014-08-22 20:23:24 +00:00
John Reck
ef22000ea9
Merge "Revert immutable Shader change" into lmp-dev
2014-08-22 20:19:34 +00:00
Dianne Hackborn
0df9722b5b
am f5b988b8: Merge "Work on issue #17011123 : Hit Back/Recents button when in Recents..." into lmp-dev
...
* commit 'f5b988b8dc1b06f21121a4c639f44b62b94359b2':
Work on issue #17011123 : Hit Back/Recents button when in Recents...
2014-08-22 20:13:26 +00:00
Dianne Hackborn
250bf41b8e
Merge "Work on issue #17011123 : Hit Back/Recents button when in Recents..." into lmp-dev
2014-08-22 20:05:39 +00:00
Adam Lesinski
caf797c84a
AAPT: Dump installLocation in badging
...
Bug:17033144
Change-Id: I87dea9af47eef8bcba1465df9b49e355ac6346ec
2014-08-22 13:01:11 -07:00
Amith Yamasani
7805a10c86
Show a user switching dialog before starting the user switch
...
switchUser() now first shows a dialog and the dialog calls
startUserInForeground to do the actual switch.
Bug: 16661752
Change-Id: Ie4e2e9eec8bf7c2116694072ea8555b8254a0e13
2014-08-22 13:00:22 -07:00
Christian Robertson
f2088d7e81
am abf664ec: Merge "Changed the color of buttonBarButtonStyle in the Material theme" into lmp-dev
...
* commit 'abf664eca01fcae8d01f0ae1dec6b8aac2c602dc':
Changed the color of buttonBarButtonStyle in the Material theme
2014-08-22 19:57:35 +00:00
Christoph Studer
6ae6ddd057
am 1352aa38: Merge "NoMan: Turn off aggregated stats" into lmp-dev
...
* commit '1352aa38f2315b30a10b199f121122c990af96d1':
NoMan: Turn off aggregated stats
2014-08-22 19:48:10 +00:00
Christoph Studer
c649d4961d
am 55c7c687: Merge "NoMan: Add flag to turn off aggregated in-mem stats" into lmp-dev
...
* commit '55c7c68726c5027cdb5b794a1a732c38e3176d0c':
NoMan: Add flag to turn off aggregated in-mem stats
2014-08-22 19:48:05 +00:00
Christian Robertson
3b4a499257
Merge "Changed the color of buttonBarButtonStyle in the Material theme" into lmp-dev
2014-08-22 19:48:00 +00:00
Lajos Molnar
70d9c85fc0
am 202c366e: Merge "MediaCodeInfo: fix support for feature-can-swap-width-height" into lmp-dev
...
* commit '202c366ee82f4d7c7b22330abfad686a3e5d4c76':
MediaCodeInfo: fix support for feature-can-swap-width-height
2014-08-22 19:48:00 +00:00
ztenghui
14aedd1fbf
Fixing AVD animation with startOffset
...
b/17160751
Change-Id: If030ca04f5a7dd7e732dcc5dfb18d51faa7e7b79
2014-08-22 12:41:06 -07:00
Christoph Studer
28d6247b3d
Merge "NoMan: Turn off aggregated stats" into lmp-dev
2014-08-22 19:40:57 +00:00
Christoph Studer
9e3618c28f
Merge "NoMan: Add flag to turn off aggregated in-mem stats" into lmp-dev
2014-08-22 19:40:17 +00:00
Lajos Molnar
a802e26d08
Merge "MediaCodeInfo: fix support for feature-can-swap-width-height" into lmp-dev
2014-08-22 19:38:23 +00:00
Tyler Gunn
4d9598c9fa
am 1bd00018: Merge "Hiding missed Video telephony related APIs." into lmp-dev
...
* commit '1bd000182d8d2a6541294235f3f2de208e0590a5':
Hiding missed Video telephony related APIs.
2014-08-22 19:22:44 +00:00
Ronghua Wu
8d277863c0
am 29b2d44c: Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev
...
* commit '29b2d44caf400cef90f48b42076e8ff25fce5754':
VideoView: unhide setVideoURI api and add document.
2014-08-22 19:22:39 +00:00
Yigit Boyar
8a57a550fb
am 907b5603: Merge "Fix RTL bug for actionbar tooltips" into lmp-dev
...
* commit '907b56033d72cdb1548da0a7ed4dd958b09cc9dc':
Fix RTL bug for actionbar tooltips
2014-08-22 19:22:35 +00:00
Yigit Boyar
f12b03a2c4
am 1884afbf: Merge "Change actionbar title size for landscape" into lmp-dev
...
* commit '1884afbf10694e1a5acbb73edd65a2049bf063ff':
Change actionbar title size for landscape
2014-08-22 19:22:31 +00:00
Tyler Gunn
9edf297055
Merge "Hiding missed Video telephony related APIs." into lmp-dev
2014-08-22 19:20:00 +00:00
Ronghua Wu
306afb9142
Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev
2014-08-22 19:16:58 +00:00
Yigit Boyar
1960b32434
Merge "Fix RTL bug for actionbar tooltips" into lmp-dev
2014-08-22 19:15:40 +00:00
Yigit Boyar
a0a6d224ad
Merge "Change actionbar title size for landscape" into lmp-dev
2014-08-22 19:15:25 +00:00
Svetoslav
7505e3315c
Fix jank in when drawing magnification bounds
...
There was an off-by-one error in computing the invalidated
rectangle when drawing the magnified region border.
bug:17199352
Change-Id: Id0a1af092b7124bbdca316534c035ed9af829326
2014-08-22 12:14:47 -07:00
Christoph Studer
0a31453864
NoMan: Turn off aggregated stats
...
Aggregated stats can grow unboundedly and shouldn't be enabled
for prod builds.
Bug: 16777910
Change-Id: I1c9303fc3aab93fd75f4dfbbf2e3de467a72f99e
2014-08-22 21:03:48 +02:00
Christoph Studer
856b2b8135
NoMan: Add flag to turn off aggregated in-mem stats
...
Bug: 16777910
Change-Id: Ic5baa910988f027c82ba16d713a44cc5d55b8333
2014-08-22 21:03:37 +02:00
Elliott Hughes
dee5cde1ec
Don't show the pseudolocales unless we're in developer mode.
...
The old zz_ZY and zz_ZZ pseudolocales are gone, replaced by ar_XB and en_XA.
The existing check for "developer mode" wasn't working, and now the
pseudolocales are there by default, we want to _remove_ them if we're not
in developer mode rather than add them if we are in developer mode.
Bug: 17190407
Change-Id: I6ee6eba53f5b816ef8e0d1768c94cd3484a196b5
2014-08-22 11:57:15 -07:00
Jae Seo
bdb7dccd8b
am 48ca66c3: Merge "TIF: Fix comments in TvContentRating" into lmp-dev
...
* commit '48ca66c3e9ae6fe0c689ba40780dfdbe2b9d99a1':
TIF: Fix comments in TvContentRating
2014-08-22 18:48:03 +00:00
Jae Seo
ae06aec9bb
Merge "TIF: Fix comments in TvContentRating" into lmp-dev
2014-08-22 18:41:32 +00:00
Tyler Gunn
75537ae00d
Hiding missed Video telephony related APIs.
...
Bug: 17188135
Change-Id: I9b569936bff285463d32df878efb26041917c51b
2014-08-22 11:33:13 -07:00