OSDN Git Service
Sriram Viswanathan [Wed, 17 Aug 2016 17:14:27 +0000 (17:14 +0000)]
Replace android auto assets with the latest
am:
e45311adc9
Change-Id: Ied7a5adcceda1efba66e91d97a835c7ccf870f4d
John Reck [Wed, 17 Aug 2016 17:14:23 +0000 (17:14 +0000)]
Fix maps resume being blank
am:
03df0834e6
Change-Id: Iad93e1b11e74acf2356d59c271892d6741b53fef
Bill Yi [Wed, 17 Aug 2016 17:14:20 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
60ab8d072a -s ours
Change-Id: I35ebad1911c8d548f3918026be446075a471d1c8
Bill Yi [Wed, 17 Aug 2016 17:14:18 +0000 (17:14 +0000)]
Import translations. DO NOT MERGE
am:
ad0dfea172 -s ours
Change-Id: I68667b5fd3777621b425093da0b64106f6dfc09c
Bill Yi [Wed, 17 Aug 2016 17:14:15 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
48d01fde6b -s ours
Change-Id: Id88552a95441037ef5825a81311a95b9dd66ac73
Bill Yi [Wed, 17 Aug 2016 17:14:13 +0000 (17:14 +0000)]
Import translations. DO NOT MERGE
am:
28753c7c4a -s ours
Change-Id: Ie2d08b1e339982bc8606ff4ecf58487604220bfe
Michael Kwan [Tue, 16 Aug 2016 17:56:41 +0000 (17:56 +0000)]
Merge "Hide space for title if the title is GONE." into cw-f-dev
Bill Yi [Tue, 16 Aug 2016 17:40:33 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Tue, 16 Aug 2016 17:40:10 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
John Reck [Tue, 16 Aug 2016 16:44:23 +0000 (09:44 -0700)]
Fix maps resume being blank
Bug:
30889568
Fixes an issue where mLayer didn't have
the mSurface set on it in certain resume
scenarios.
Change-Id: Ib75065d3d75e6141d6cd8f306584f6a569b9907c
TreeHugger Robot [Tue, 16 Aug 2016 15:32:03 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 16 Aug 2016 15:30:36 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 16 Aug 2016 09:02:06 +0000 (02:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae3ad7fc7b524b82d0e71c65a0d53a76b9ecff68
Auto-generated-cl: translation import
Bill Yi [Tue, 16 Aug 2016 07:29:56 +0000 (00:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c27b0c03c815ecccf209cd70ab764b836c7932b
Auto-generated-cl: translation import
Bill Yi [Tue, 16 Aug 2016 02:03:54 +0000 (19:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1e14fdd967a5e1abbf775ea762a369d562a90dd
Auto-generated-cl: translation import
Bill Yi [Tue, 16 Aug 2016 01:48:31 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d57a1d9c2c7742fe3f73355211fe54e514554eb
Auto-generated-cl: translation import
Rob Carr [Tue, 16 Aug 2016 01:46:06 +0000 (01:46 +0000)]
Merge changes I082e323e,I326bf776 into nyc-mr1-dev
am:
c991a7ad54
Change-Id: Ia26593ab5b53c34656af1095f63bffa9ebcde27f
Robert Carr [Tue, 16 Aug 2016 01:46:04 +0000 (01:46 +0000)]
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
am:
aab09158e9
Change-Id: If1c06bf70128af337d23bfa58157e16a0dea9b3b
Robert Carr [Tue, 16 Aug 2016 01:44:28 +0000 (01:44 +0000)]
Allow seamless rotation before mTopIsFullscreen is set.
am:
1ccd42510f
Change-Id: I52b5d288993a4fbf5b265f32e238b40a4b68f8d6
Dirk Dougherty [Tue, 16 Aug 2016 01:44:19 +0000 (01:44 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev am:
114c09498d
am:
13a5f3515f
Change-Id: I421a40de8a7c3aee6ea087a12c6862b8051765a9
Dirk Dougherty [Tue, 16 Aug 2016 01:44:14 +0000 (01:44 +0000)]
Doc change: escape lt char in generic type in pre block. am:
1035b25825
am:
61a7f64e1f
Change-Id: Id086866cc0c047fb8ea88cb16c863ebd11b7f7b0
Robert Carr [Tue, 16 Aug 2016 01:36:05 +0000 (01:36 +0000)]
Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev
am:
b14543d9d8
Change-Id: I3edf4558a7cfabb40abc9cfc9393288d2a5b72b8
Robert Carr [Tue, 16 Aug 2016 01:35:59 +0000 (01:35 +0000)]
Introduce new constant for double tap gesture rotation hint.
am:
57d9fbd17f
Change-Id: I994c15c692ec52160deb3d29b46396802562588a
Rob Carr [Tue, 16 Aug 2016 01:31:31 +0000 (01:31 +0000)]
Merge changes I082e323e,I326bf776 into nyc-mr1-dev
* changes:
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
Allow seamless rotation before mTopIsFullscreen is set.
Dirk Dougherty [Tue, 16 Aug 2016 01:30:07 +0000 (01:30 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
am:
114c09498d
Change-Id: Ie7f79a9236823a9066867fb52bf352523730ec3f
Dirk Dougherty [Tue, 16 Aug 2016 01:30:04 +0000 (01:30 +0000)]
Doc change: escape lt char in generic type in pre block.
am:
1035b25825
Change-Id: I4e4c01fe612bbcf05c31c6d33da6bbbe837aa468
TreeHugger Robot [Tue, 16 Aug 2016 01:21:56 +0000 (01:21 +0000)]
Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev
Dirk Dougherty [Tue, 16 Aug 2016 01:17:31 +0000 (01:17 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
Suprabh Shukla [Tue, 16 Aug 2016 00:32:56 +0000 (00:32 +0000)]
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev
am:
f5e51cf7a9
Change-Id: Ic44c61742ba56f887cf90ab6428b8c8642e355e3
Suprabh Shukla [Tue, 16 Aug 2016 00:32:55 +0000 (00:32 +0000)]
Changing user inactivity and warning dialog timeouts
am:
cafdc2e50d
Change-Id: Iba74fd833ba00cbae39e09cf404f1877efd7a4d8
Fyodor Kupolov [Tue, 16 Aug 2016 00:25:59 +0000 (00:25 +0000)]
Merge "Count failed install as finished" into nyc-mr1-dev
am:
ab35493046
Change-Id: I5e65fd656bcad8b8de5742e01e90709954bb7102
Fyodor Kupolov [Tue, 16 Aug 2016 00:25:57 +0000 (00:25 +0000)]
Count failed install as finished
am:
4f4780f023
Change-Id: Ia1ddcde1b9bcb37a266589ff53ed01632e442c7b
TreeHugger Robot [Tue, 16 Aug 2016 00:21:34 +0000 (00:21 +0000)]
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev
TreeHugger Robot [Mon, 15 Aug 2016 23:58:06 +0000 (23:58 +0000)]
Merge "Count failed install as finished" into nyc-mr1-dev
Adrian Roos [Mon, 15 Aug 2016 23:49:01 +0000 (23:49 +0000)]
Merge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev
am:
094b8b3321
Change-Id: I308a6550ce47b0083b28a2a2cf89d82b692b2939
Adrian Roos [Mon, 15 Aug 2016 23:48:58 +0000 (23:48 +0000)]
Fix bug where RemoteInputView didn't reopen the IME
am:
0356865dad
Change-Id: I983cd6d0abc35af375d95722606969f13aebb9f5
TreeHugger Robot [Mon, 15 Aug 2016 23:45:04 +0000 (23:45 +0000)]
Merge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev
Adam Lesinski [Mon, 15 Aug 2016 23:11:49 +0000 (23:11 +0000)]
Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev
am:
1031069f1d
Change-Id: Ic2fce0e9b9769630f9a59065f317ea34201be079
Adam Lesinski [Mon, 15 Aug 2016 23:11:37 +0000 (23:11 +0000)]
AAPT: Fix use-after-free error
am:
193ed74c2d
Change-Id: I04cd726dae52c5010ad99409f0f77a10267bdeed
TreeHugger Robot [Mon, 15 Aug 2016 22:56:00 +0000 (22:56 +0000)]
Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev
Suprabh Shukla [Mon, 15 Aug 2016 19:50:32 +0000 (12:50 -0700)]
Changing user inactivity and warning dialog timeouts
Increasing the inactivity timeout to 90 seconds to accomodate the longest
app. demo video for retail. Also, removing the warning dialog by setting
the countdown timeout to 0, so it can be re-enabled by overriding the value
through gservices if needed.
Bug:
30426773
Bug:
30866394
Change-Id: I6735943adfaf3d210ed9eb9163b5c7ce8dcf53ec
Tyler Gunn [Mon, 15 Aug 2016 22:42:38 +0000 (22:42 +0000)]
Merge "Add missing remote conference property set." into nyc-mr1-dev
am:
aa9b18f90a
Change-Id: I1176b63a1d84829b79b9e540747a27b777e88c47
Tyler Gunn [Mon, 15 Aug 2016 22:42:36 +0000 (22:42 +0000)]
Add missing remote conference property set.
am:
04ce757860
Change-Id: Iba041654d136b3cd00cfc19899cefa68ebf01b76
Tyler Gunn [Mon, 15 Aug 2016 22:32:02 +0000 (22:32 +0000)]
Merge "Add missing remote conference property set." into nyc-mr1-dev
Fyodor Kupolov [Mon, 15 Aug 2016 22:29:47 +0000 (15:29 -0700)]
Count failed install as finished
Otherwise DEMO_USER_SETUP_COMPLETE will not be set.
Bug:
30445353
Change-Id: Id2a0c1b1643dd9846328a20f4c67e11e69b3bc84
Robert Carr [Mon, 15 Aug 2016 19:19:00 +0000 (12:19 -0700)]
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
In what can only be called an unfortunate workaround we require
seamlessly rotated child windows to have the
TRANSFORM_TO_DISPLAY_INVERSE
flag. Due to limitations in the client API, there is no way for the
client to set this flag in a race free fashion. If we seamlessly rotate
a window which does not have this flag, but then it gains it,
we will have an incorrect visual result (rotated buffer contents). This
means if we want to support seamlessly rotating windows which could gain
this flag, we can't seamlessly rotate windows which don't have it. This
unfortunately limits seamless rotation in N to Camera framework users,
native code, and applications without child windows. This is unfortunate
but having the camera work was always our primary use case, and it's not
as if we are offering an API for it, it's a behind the scenes
enhancement of ROTATION_ANIMATION_JUMPCUT.
Bug:
30171992
Change-Id: I082e323ee569cfc1ff2559657cc22194c251c7ec
Adrian Roos [Mon, 15 Aug 2016 22:02:46 +0000 (15:02 -0700)]
Fix bug where RemoteInputView didn't reopen the IME
Editable TextViews are implicitly selectable. Setting the selectable
property to true however causes a bug where the onTouch logic thinks
the view is not editable and thus doesn't show the IME when clicking
that view.
Change-Id: I9dd6139195bd98b26293e330290650d4e5549a6d
Fixes:
30595718
Selim Cinek [Mon, 15 Aug 2016 22:02:18 +0000 (22:02 +0000)]
Fixed an issue where the background could show in a wrong way
am:
d381bc3133
Change-Id: I219e4809a6a9f839353e049d4d563ece37866ca2
Selim Cinek [Mon, 15 Aug 2016 19:40:57 +0000 (12:40 -0700)]
Fixed an issue where the background could show in a wrong way
Change-Id: Icefeb2275d6cbabc576c35990ce4441b3a41ebd9
Fixes:
30855224
Dianne Hackborn [Mon, 15 Aug 2016 21:25:44 +0000 (21:25 +0000)]
Merge "Docs only: N is no longer a shrug." into nyc-mr1-dev
am:
6af2db3824
Change-Id: Idae2d16055e26e721584e428c44af0f2b1828557
Dianne Hackborn [Mon, 15 Aug 2016 21:25:41 +0000 (21:25 +0000)]
Docs only: N is no longer a shrug.
am:
c1b607df71
Change-Id: Iaf3a4c23ec9c94dccfa6db15e6caf90a74a5f3c0
Adam Lesinski [Mon, 15 Aug 2016 21:19:46 +0000 (14:19 -0700)]
AAPT: Fix use-after-free error
Re-order deletion of ResXMLTree and the Asset object
it iterates over.
Bug:
30844391
Change-Id: Ied033d0a8f93343006228a2054c6d0f42bb4717a
Dianne Hackborn [Mon, 15 Aug 2016 21:16:41 +0000 (21:16 +0000)]
Merge "Docs only: N is no longer a shrug." into nyc-mr1-dev
Chong Zhang [Mon, 15 Aug 2016 20:51:52 +0000 (20:51 +0000)]
Wallpaper target selection during animation
am:
b0d267043a
Change-Id: Ib649f9399d6c9f7f84f05ddef8dd8e3d87bb7923
Chong Zhang [Fri, 12 Aug 2016 23:03:29 +0000 (16:03 -0700)]
Wallpaper target selection during animation
In case of double tapping from Home, there could be two set of
transitions, first is launcher->Recents, followed shortly by
Recents->app. On the second transition, it should be running
a wallpaper close, but because of the way we pick wallpaper
target, sometimes we pick launcher if both launcher & Recents
are animating away. This makes us to run a different animation
which could involve dimming the wallpaper briefly.
Also, findWallpaperTarget() sometimes could toggle between two
valid wallpaper targets, picking either of them gives correct
result for showing the wallpaper, but could result in different
exit transition.
This change prefers the visible target if there is only one
visible, otherwise the one in opening or closing app list. This
helps maybeUpdateTransitToWallpaper to better choose transition.
bug:
30831873
Change-Id: I0eaa89bdc35f5f51875d5cbeceba11ce40f4791f
Julius D'souza [Mon, 15 Aug 2016 19:55:56 +0000 (19:55 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours am:
0903c5fe7a -s ours am:
f51dfc24d1 -s ours
am:
e543fb29b2 -s ours
Change-Id: Ic9de880e84205d0bed213e56cf476e1d15dfcfa9
Julius D'souza [Mon, 15 Aug 2016 19:47:33 +0000 (19:47 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours am:
0903c5fe7a -s ours
am:
f51dfc24d1 -s ours
Change-Id: Iada12a5685d32efafedd18b4d6fba5b8cc642f60
Jason Monk [Mon, 15 Aug 2016 19:35:00 +0000 (19:35 +0000)]
Merge "QS Footer: Don't update icon from wrong thread." into nyc-mr1-dev
am:
aedfa81517
Change-Id: I281d14459a03556d96236a9ebb2a08ebd2c53110
Jason Monk [Mon, 15 Aug 2016 19:34:58 +0000 (19:34 +0000)]
QS Footer: Don't update icon from wrong thread.
am:
f9c6026a7d
Change-Id: Ie473b181aaf6fc4ea91d8e986188cdc6f06d87ef
Julius D'souza [Mon, 15 Aug 2016 19:33:29 +0000 (19:33 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours
am:
0903c5fe7a -s ours
Change-Id: Iba7ccc2ec071ea8c13d146b39aab48d2f4fc4977
TreeHugger Robot [Mon, 15 Aug 2016 19:25:45 +0000 (19:25 +0000)]
Merge "QS Footer: Don't update icon from wrong thread." into nyc-mr1-dev
Robert Carr [Mon, 15 Aug 2016 19:05:21 +0000 (12:05 -0700)]
Allow seamless rotation before mTopIsFullscreen is set.
The difference between mTopFullscreenOpaqueWindowState != null
and mTopIsFullscreen relates to whether the status bar is animating.
However the flag won't be cleared until the next layout pass following
the animation. As long as the window isn't animating we are fine to
rotate seamlessly. This check was copied from selectRotationAnimationLw.
A little code archaeology implies it was perhaps historical and
introduced before the flag had this meaning.
Bug:
30171992
Change-Id: I326bf7766f8ebe307b833d1ca0c0cdfe80b1eb6c
Robert Carr [Mon, 15 Aug 2016 19:00:35 +0000 (12:00 -0700)]
Introduce new constant for double tap gesture rotation hint.
As discussed in ag/
1192965/ we have a special case for rotation
animation selection in launch from double tap. This was set to
ROTATION_ANIMATION_CROSSFADE as the goal was just to avoid
ROTATION_ANIMATION_ROTATE on the viewfinder surface and
seamless rotation in launch scenarios was initially descoped. Now we
are aiming at fixing this though, and ROTATION_ANIMATION_CROSSFADE
does not quality for seamless rotation. ROTATION_ANIMATION_JUMPCUT
also would not be a good choice because in the situation that the
rotation occurs before the app starting window appears, then we would
jump cut from unrotated wallpaper to rotated app, I think we want
a crossfade in this scenario. To this end introduce and use a new @hide constant
ROTATION_ANIMATION_SEAMLESS which qualifies for seamless but falls back
to CROSSFADE if seamless can't occur.
Bug:
30171992
Change-Id: If1945b17b5159be4cd5ba0b139d6bea9f7fcca33
Julius D'souza [Mon, 15 Aug 2016 19:25:33 +0000 (19:25 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
am:
13edf0a70b -s ours
Change-Id: I7c02cea3ea0008f3f112063b6a06d08049c4998b
Julius D'souza [Fri, 5 Aug 2016 21:34:38 +0000 (14:34 -0700)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
Add overlay setting with current default value.
Bug:
30085530
Change-Id: Ib5d2448b88cfb66a97febcdf06e2118c84b16cd0
Chong Zhang [Mon, 15 Aug 2016 19:14:52 +0000 (19:14 +0000)]
Revert "DO NOT MERGE -- Revert the following two commits as they're causing flickering"
am:
f96cb3c34d
Change-Id: I1756346f1713f758374f2b8476c70a60119986dd
Chong Zhang [Mon, 15 Aug 2016 19:14:50 +0000 (19:14 +0000)]
Merge "Allow performShowLocked when transition animation started" into nyc-mr1-dev
am:
1fb9466c1d
Change-Id: I47692dcaef58641e1fbf6632cfb59d843c43d667
Chong Zhang [Mon, 15 Aug 2016 19:14:48 +0000 (19:14 +0000)]
Allow performShowLocked when transition animation started
am:
83caa366f4
Change-Id: I6897267073728cf236e1ad98c3092666bb246e49
Chong Zhang [Mon, 15 Aug 2016 18:09:29 +0000 (11:09 -0700)]
Revert "DO NOT MERGE -- Revert the following two commits as they're causing flickering"
This reverts commit
44bd57ee25484bd74025c116f8a83d1df5990f34.
bug:
30831873
bug:
30790402
Chong Zhang [Mon, 15 Aug 2016 19:04:47 +0000 (19:04 +0000)]
Merge "Allow performShowLocked when transition animation started" into nyc-mr1-dev
Selim Cinek [Mon, 15 Aug 2016 18:46:07 +0000 (18:46 +0000)]
Merge "Fixed that HUNs wouldn't show when the keyguard is occluded" into nyc-mr1-dev
am:
45d2ff9b6a
Change-Id: I53aea1f2845dc56cad468c793e32db4dcf5065fe
Selim Cinek [Mon, 15 Aug 2016 18:46:04 +0000 (18:46 +0000)]
Fixed that HUNs wouldn't show when the keyguard is occluded
am:
2dabc8286b
Change-Id: If70dd09b854dfdd5964733d802d95185ee04b841
Selim Cinek [Mon, 15 Aug 2016 18:35:57 +0000 (18:35 +0000)]
Merge "Fixed that HUNs wouldn't show when the keyguard is occluded" into nyc-mr1-dev
Jason Monk [Mon, 15 Aug 2016 17:57:43 +0000 (13:57 -0400)]
QS Footer: Don't update icon from wrong thread.
Change-Id: I25191818579fac57236b67d7291b6ee00dd838b5
Fixes:
30748384
Tyler Gunn [Mon, 15 Aug 2016 17:56:12 +0000 (10:56 -0700)]
Add missing remote conference property set.
When creating a new remote conference, there was a missing call to
"setConnectionProperties". This would prevent remote conferences from
being created with the correct properties as defined in the actual
conference.
Bug:
30383741
Change-Id: I335e35c222ae18b0d6ea7e750b91bcc36aa40ece
Chong Zhang [Mon, 15 Aug 2016 01:47:54 +0000 (18:47 -0700)]
Allow performShowLocked when transition animation started
Some transitions can have no animation, in which case
isReadyForDisplayIgnoringKeyguard() will wait for VIEW visibility
to become VISIBLE. But if we have a saved surface, the transition
could have already started. This causes exiting app to be hidden,
while entering app's performShowLocked() still hold back waiting
for the relayout to visible.
If we started animating with saved surface, it should also count
as transition animation started.
b/
30855380
Change-Id: I6260a323b48e57d8337267d9136f630226a48dc8
David Gross [Mon, 15 Aug 2016 17:40:18 +0000 (17:40 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev am:
8cb4ca439e
am:
375ac04044
Change-Id: Ib3a19c1c2814f1359b4e78a809f2e53f76a27158
David Gross [Mon, 15 Aug 2016 17:40:16 +0000 (17:40 +0000)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup. am:
b50e856fc7
am:
1f5b0ea408
Change-Id: I2bccf9a9e112ed1320b7782f724879793cc54baf
David Gross [Mon, 15 Aug 2016 17:23:17 +0000 (17:23 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev
am:
8cb4ca439e
Change-Id: I1507e8d3d8bf588ea48e17b3d93ced19228d5d21
David Gross [Mon, 15 Aug 2016 17:23:14 +0000 (17:23 +0000)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
am:
b50e856fc7
Change-Id: I37cf0227be2a32261b44f19f6d45a5ea4ff6f624
David Gross [Mon, 15 Aug 2016 17:17:01 +0000 (17:17 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev
Adam Lesinski [Sat, 13 Aug 2016 00:52:05 +0000 (00:52 +0000)]
Merge "SamplingTimer: Fix issue with summary recording too much" into nyc-mr1-dev
am:
8aacc3cf98
Change-Id: Id8d2f7214393e08c771cc8e49884b76b1501054e
Adam Lesinski [Sat, 13 Aug 2016 00:52:03 +0000 (00:52 +0000)]
SamplingTimer: Fix issue with summary recording too much
am:
9edd6be542
Change-Id: Id423f0343c2d435281d47cd6edacb6816baaace8
TreeHugger Robot [Sat, 13 Aug 2016 00:40:52 +0000 (00:40 +0000)]
Merge "SamplingTimer: Fix issue with summary recording too much" into nyc-mr1-dev
Christopher Tate [Sat, 13 Aug 2016 00:39:07 +0000 (00:39 +0000)]
Merge "Remember all wallpapers' backup-allow state" into nyc-mr1-dev
am:
6ae8693cd7
Change-Id: Iade90bf272d1b05c18b79c679c53ada2a8782742
Christopher Tate [Sat, 13 Aug 2016 00:39:01 +0000 (00:39 +0000)]
Remember all wallpapers' backup-allow state
am:
c613c63096
Change-Id: I0f1e1bf9c747c6b8678e121517f230d6a9e934dc
TreeHugger Robot [Sat, 13 Aug 2016 00:24:10 +0000 (00:24 +0000)]
Merge "Remember all wallpapers' backup-allow state" into nyc-mr1-dev
Adrian Roos [Sat, 13 Aug 2016 00:20:10 +0000 (00:20 +0000)]
Merge "Fix LockscreenWallpaper jank" into nyc-mr1-dev
am:
6912cf9b30
Change-Id: Ib9c4252cf57d59daded6f2c5cdec143ece1a28fb
Adrian Roos [Sat, 13 Aug 2016 00:20:08 +0000 (00:20 +0000)]
Fix LockscreenWallpaper jank
am:
d866b02d54
Change-Id: Iad0c7104d644ebe5fa86a12cc765fc0916103c19
TreeHugger Robot [Sat, 13 Aug 2016 00:12:59 +0000 (00:12 +0000)]
Merge "Fix LockscreenWallpaper jank" into nyc-mr1-dev
Dianne Hackborn [Fri, 12 Aug 2016 23:15:44 +0000 (16:15 -0700)]
Docs only: N is no longer a shrug.
Change-Id: I6fa8f77d93f53b7969ec6aab4c7e9ca27d17d01f
Robert Carr [Fri, 12 Aug 2016 23:55:31 +0000 (23:55 +0000)]
Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev
am:
64d7220153
Change-Id: I02e3fc3a6738f6b691b57fa3f2771d647e93cd7a
Robert Carr [Fri, 12 Aug 2016 23:55:28 +0000 (23:55 +0000)]
Copy exiting app token list while stepping animation.
am:
46831fa9ff
Change-Id: I53c41afd54b9a315a0734dce357b1eef8485b84b
TreeHugger Robot [Fri, 12 Aug 2016 23:48:12 +0000 (23:48 +0000)]
Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev
Adam Lesinski [Fri, 12 Aug 2016 22:49:44 +0000 (15:49 -0700)]
SamplingTimer: Fix issue with summary recording too much
The summary is supposed to just hold enough data to continue counting
once the device has reset. Since kernel stats reset when the device
resets, and the first update is ignored to account for soft resets where the
kernel continues running, SamplingTimer should not be recording the last value
it saw from /proc/wakelocks in the summary.
Bug:
30575302
Change-Id: Ic193bc5af9a0ede514e3abc8146523d7316c47d3
Adrian Roos [Fri, 12 Aug 2016 22:29:36 +0000 (15:29 -0700)]
Fix LockscreenWallpaper jank
Change-Id: I3f11d26eaa51eb509284fb1bb25eab03a4f243a0
Fixes:
30493315
Robert Carr [Fri, 12 Aug 2016 20:50:38 +0000 (13:50 -0700)]
Copy exiting app token list while stepping animation.
Stepping the animation can lead to WindowStateAnimator#finishExit,
which can lead to WindowManagerService#removeWindowInnerLocked, which
can immediately call WindowSurfacePlacer.performSurfacePlacement. From
here we will directly modify mExitingAppTokens for each stack and remove
tokens where exiting is complete. I think removeWindowInnerLocked making
a direct call to performSurfacePlacement is questionable...but changing
semantics there is very risky. For now, simply avoid processing tokens
in the animator if the surface placer has removed them. It seems all we
would want to do is trigger a layout pass, which has just occured anyway.
Bug:
30813094
Change-Id: Iaff77d227e09839f7e6edda6b8f188d164e6da74
Hui Shu [Fri, 12 Aug 2016 21:29:50 +0000 (21:29 +0000)]
Merge "Fix documentation." into nyc-mr1-dev
am:
caef4afe42
Change-Id: Icae5423ea33b2cbbfe120540818a23bdab0a8d2b
Hui Shu [Fri, 12 Aug 2016 21:29:47 +0000 (21:29 +0000)]
Fix documentation.
am:
bd042e666a
Change-Id: Ib749bd51c24a2012cd2b0d87ed70c034f410bc58
Hui Shu [Fri, 12 Aug 2016 21:24:42 +0000 (21:24 +0000)]
Merge "Fix documentation." into nyc-mr1-dev