OSDN Git Service
Suprabh Shukla [Tue, 16 Aug 2016 00:56:43 +0000 (00:56 +0000)]
Changing user inactivity and warning dialog timeouts am:
cafdc2e50d
am:
925a30e82b
Change-Id: Ia999e7deec13087cb0084b21b737fbff7aaf0bf4
Fyodor Kupolov [Tue, 16 Aug 2016 00:41:36 +0000 (00:41 +0000)]
Merge "Count failed install as finished" into nyc-mr1-dev am:
ab35493046
am:
8b85bed24b
Change-Id: I918da4f2cff5ad55258ee2f4c10631887b4eb113
Fyodor Kupolov [Tue, 16 Aug 2016 00:41:32 +0000 (00:41 +0000)]
Count failed install as finished am:
4f4780f023
am:
dc2963f20b
Change-Id: I967f127a11d195549373c357436c3a9002f39e0d
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 [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:57:48 +0000 (23:57 +0000)]
Merge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev am:
094b8b3321
am:
88dead0f19
Change-Id: Ib21b08a7ad50aa7262778ca1930a10e782d37aa5
Adrian Roos [Mon, 15 Aug 2016 23:57:45 +0000 (23:57 +0000)]
Fix bug where RemoteInputView didn't reopen the IME am:
0356865dad
am:
2bf73bbb43
Change-Id: I5e5561ee9831946325df02f806d9c32cbb30555b
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:22:13 +0000 (23:22 +0000)]
Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev am:
1031069f1d
am:
ae5a79ad12
Change-Id: I8749fcefe6c98cf6609abac49b368fd2c5201eac
Adam Lesinski [Mon, 15 Aug 2016 23:22:04 +0000 (23:22 +0000)]
AAPT: Fix use-after-free error am:
193ed74c2d
am:
646f2d9c33
Change-Id: If9fe7a52e62ae6b2900aa187996b4b785894ab03
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
Tyler Gunn [Mon, 15 Aug 2016 22:50:34 +0000 (22:50 +0000)]
Merge "Add missing remote conference property set." into nyc-mr1-dev am:
aa9b18f90a
am:
273f01785d
Change-Id: I53490a7d67d8dc909049338ec7470acdc8cf801f
Tyler Gunn [Mon, 15 Aug 2016 22:50:30 +0000 (22:50 +0000)]
Add missing remote conference property set. am:
04ce757860
am:
69c13eca0e
Change-Id: Ia6db6017bde649b451c82ec3280deeba4e3989b7
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
Selim Cinek [Mon, 15 Aug 2016 22:10:54 +0000 (22:10 +0000)]
Fixed an issue where the background could show in a wrong way am:
d381bc3133
am:
3ff0c5b3ce
Change-Id: I1f02f607593fbf9adcaae6cf92bb5ec559bcaa21
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:35:57 +0000 (21:35 +0000)]
Merge "Docs only: N is no longer a shrug." into nyc-mr1-dev am:
6af2db3824
am:
1377b38053
Change-Id: If3400e262cdfa9bdbf19af1dcad61bce967ba06b
Dianne Hackborn [Mon, 15 Aug 2016 21:35:48 +0000 (21:35 +0000)]
Docs only: N is no longer a shrug. am:
c1b607df71
am:
6fe27966e2
Change-Id: I0d441487fae3e95741f83ab92042bca7547006ae
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 21:08:33 +0000 (21:08 +0000)]
Wallpaper target selection during animation am:
b0d267043a
am:
f74e7ee4a3
Change-Id: Iacf65c88743cdbd2b40cfee0be4ba844fb122be8
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 20:07:16 +0000 (20:07 +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
am:
603e631c51 -s ours
Change-Id: I76cd0c0bd8c01c6ded00681903a1dabbe4760df3
Julius D'souza [Mon, 15 Aug 2016 19:56:18 +0000 (19:56 +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:
6864ffeead -s ours
Change-Id: I61414d658c8ebb77add50ee4c9319bf3c8f0297d
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:43 +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: I1afeaa3f5321c536cad22455881b36582b468748
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:47:33 +0000 (19:47 +0000)]
Merge "QS Footer: Don't update icon from wrong thread." into nyc-mr1-dev am:
aedfa81517
am:
1d2ef7f1b8
Change-Id: Ia381e4ae34d263829531d52ba689dc8bfb9f4070
Jason Monk [Mon, 15 Aug 2016 19:47:30 +0000 (19:47 +0000)]
QS Footer: Don't update icon from wrong thread. am:
f9c6026a7d
am:
b10b51277f
Change-Id: If585197223ec5767c2f63dce8717eda82d482a30
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
Chong Zhang [Mon, 15 Aug 2016 19:25:40 +0000 (19:25 +0000)]
Revert "DO NOT MERGE -- Revert the following two commits as they're causing flickering" am:
f96cb3c34d
am:
0caf507dbe
Change-Id: Iaf539d5af86a0de2b1b6bade7817edd3bbe22e37
Chong Zhang [Mon, 15 Aug 2016 19:25:36 +0000 (19:25 +0000)]
Merge "Allow performShowLocked when transition animation started" into nyc-mr1-dev am:
1fb9466c1d
am:
2261bb362b
Change-Id: I92ea546d7f197c2f5c8dc6e0b00f88f48274fdaa
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
Chong Zhang [Mon, 15 Aug 2016 19:25:33 +0000 (19:25 +0000)]
Allow performShowLocked when transition animation started am:
83caa366f4
am:
280d7fdcb0
Change-Id: I3ee41e89c6ec089f152531cbd90f13a707863628
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
Selim Cinek [Mon, 15 Aug 2016 19:05:07 +0000 (19:05 +0000)]
Merge "Fixed that HUNs wouldn't show when the keyguard is occluded" into nyc-mr1-dev am:
45d2ff9b6a
am:
f67cd1dbe9
Change-Id: Ia84fbef6b57204c29e2ebe63d9fec7b0d17c2ab9
Selim Cinek [Mon, 15 Aug 2016 19:05:04 +0000 (19:05 +0000)]
Fixed that HUNs wouldn't show when the keyguard is occluded am:
2dabc8286b
am:
2a5ad74860
Change-Id: Id573dfb2c7db51e6a62aae7153c86545eae9b9f7
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:49:04 +0000 (17:49 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev am:
8cb4ca439e am:
375ac04044
am:
4fed2a4b6c
Change-Id: I2318b0a9e74fe51381f2a6872d442eaeec608eb0
David Gross [Mon, 15 Aug 2016 17:49:00 +0000 (17:49 +0000)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup. am:
b50e856fc7 am:
1f5b0ea408
am:
ccc07ac448
Change-Id: I00dc143aca0860131c2fafd323a2fb53ce9e5b7c
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:32:39 +0000 (17:32 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev am:
8cb4ca439e
am:
7cd06dc384
Change-Id: Iaeff16e1621c5b978271cf74e7b102cd94846825
David Gross [Mon, 15 Aug 2016 17:32:36 +0000 (17:32 +0000)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup. am:
b50e856fc7
am:
b869263b5d
Change-Id: I977d1120382fd9429bbc221d544295328e0e43e5
David Gross [Mon, 15 Aug 2016 17:23:24 +0000 (17:23 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev
am:
8cb4ca439e
Change-Id: I76c6a8ebc739daa1aa124fecccf6fcc341e8fd7a
David Gross [Mon, 15 Aug 2016 17:23:18 +0000 (17:23 +0000)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
am:
b50e856fc7
Change-Id: Iad5173dfd05c77284d74bbff2c095d91064a941f
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:59:41 +0000 (00:59 +0000)]
Merge "SamplingTimer: Fix issue with summary recording too much" into nyc-mr1-dev am:
8aacc3cf98
am:
16b8cc1eda
Change-Id: Ia2f0cac350e04cbcc5440862d3779a024c1ba523
Adam Lesinski [Sat, 13 Aug 2016 00:59:35 +0000 (00:59 +0000)]
SamplingTimer: Fix issue with summary recording too much am:
9edd6be542
am:
e5852eb501
Change-Id: Ie4ab1a86f0c28a41ed84e861c83d38bf1a90a4c8
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
Christopher Tate [Sat, 13 Aug 2016 00:46:45 +0000 (00:46 +0000)]
Merge "Remember all wallpapers' backup-allow state" into nyc-mr1-dev am:
6ae8693cd7
am:
0fdb14ae80
Change-Id: Ib3f07fd3a91aaabecbce24c68c50d0b13a210c5e
Christopher Tate [Sat, 13 Aug 2016 00:46:35 +0000 (00:46 +0000)]
Remember all wallpapers' backup-allow state am:
c613c63096
am:
67c0d08a46
Change-Id: Ia3d358e8da3a68defccefedc0e23719b25e41bbf
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
Adrian Roos [Sat, 13 Aug 2016 00:28:09 +0000 (00:28 +0000)]
Merge "Fix LockscreenWallpaper jank" into nyc-mr1-dev am:
6912cf9b30
am:
75ff71de77
Change-Id: Ie81379189c19be45c5c1002c8ad3916bad20d56f
Adrian Roos [Sat, 13 Aug 2016 00:28:03 +0000 (00:28 +0000)]
Fix LockscreenWallpaper jank am:
d866b02d54
am:
bce85f3986
Change-Id: Ia8138f5db517412c9fc8491cca69caf82a881530
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
Robert Carr [Sat, 13 Aug 2016 00:04:03 +0000 (00:04 +0000)]
Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev am:
64d7220153
am:
8c9aa63827
Change-Id: I3def8f6d7fdc08104a0b428f436967481dd578fb
Robert Carr [Sat, 13 Aug 2016 00:03:55 +0000 (00:03 +0000)]
Copy exiting app token list while stepping animation. am:
46831fa9ff
am:
8cf4062a07
Change-Id: Iee486eaeaca5211c2ee284602b9e593be385e03c
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
Hui Shu [Fri, 12 Aug 2016 23:19:45 +0000 (23:19 +0000)]
Merge "Fix documentation." into nyc-mr1-dev am:
caef4afe42
am:
42373881fe
Change-Id: I08d8c3868c396da7a63ce4c716f3267d225390fe
Hui Shu [Fri, 12 Aug 2016 23:19:41 +0000 (23:19 +0000)]
Fix documentation. am:
bd042e666a
am:
440d84f99a
Change-Id: I1d0c75c6692557e1d66ca66036bceda6ca62c702