OSDN Git Service
Zhentao Sun [Wed, 19 Aug 2015 16:24:35 +0000 (16:24 +0000)]
am
880ef585: am
f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev
* commit '
880ef585ab1887bd7f95a1a668d11057d86dd964':
Launched camera in the correct user.
Zhentao Sun [Wed, 19 Aug 2015 16:18:06 +0000 (16:18 +0000)]
am
f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev
* commit '
f2f0114848e5fb729bf5943a70142520f66daa4c':
Launched camera in the correct user.
Zhentao Sun [Wed, 19 Aug 2015 16:12:25 +0000 (16:12 +0000)]
Merge "Launched camera in the correct user." into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 14:20:53 +0000 (14:20 +0000)]
am
257a9a87: (-s ours) am
81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
257a9a87d49a6bda05e9d18940152213fd156f0f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:15:26 +0000 (14:15 +0000)]
am
81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
81d99d47831153cfa71afaa1831b7a1e025e3069':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:07:53 +0000 (14:07 +0000)]
am
0c6eba36: (-s ours) am
c2e81a0c: (-s ours) Import translations. DO NOT MERGE
* commit '
0c6eba366e77daeedecdffdd4d1dcf9406d39117':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:07:13 +0000 (14:07 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 14:02:46 +0000 (07:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13d19cb68c1b7b7880e2168e621c377c2b750b1b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 19 Aug 2015 14:02:25 +0000 (14:02 +0000)]
am
c2e81a0c: (-s ours) Import translations. DO NOT MERGE
* commit '
c2e81a0c2d95c0eee54975cb62b6c535171d74ee':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 13:53:44 +0000 (06:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifd3cfe65e9a82e21d6a1611368dcbe9d6dfee829
Auto-generated-cl: translation import
Jorim Jaggi [Wed, 19 Aug 2015 02:35:26 +0000 (02:35 +0000)]
am
8cc1abcb: am
b960e75e: am
8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '
8cc1abcb7fdebcfd777bfbfc7b905bd9276bbb7c':
Fix SysUI crash when no metadata is provided
Jorim Jaggi [Wed, 19 Aug 2015 02:27:04 +0000 (02:27 +0000)]
am
b960e75e: am
8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '
b960e75e52176bc4edc709aba71535b32e2d9970':
Fix SysUI crash when no metadata is provided
Jorim Jaggi [Wed, 19 Aug 2015 02:20:10 +0000 (02:20 +0000)]
am
8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '
8b8fa3e934e3ddf01790e647b4401dc88b24bf67':
Fix SysUI crash when no metadata is provided
Jorim Jaggi [Wed, 19 Aug 2015 01:33:49 +0000 (18:33 -0700)]
Fix SysUI crash when no metadata is provided
Bug:
23327474
Change-Id: I4903c0812c9677e1b31e1f645e3d6f1a03150c38
Jorim Jaggi [Wed, 19 Aug 2015 01:33:57 +0000 (01:33 +0000)]
am
e6c029b4: am
27c1a728: am
f610bd78: Fix race conditions for camera prewarm service
* commit '
e6c029b48d18524dbc107939bb28e8efe46bfb34':
Fix race conditions for camera prewarm service
Jorim Jaggi [Wed, 19 Aug 2015 01:33:52 +0000 (01:33 +0000)]
am
ebcd9d55: am
0835f33a: Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev
* commit '
ebcd9d558f1d9e17b5b04d96b816dffb2d8c8d13':
Improve motion for wake-and-unlocking while pulsing
Jorim Jaggi [Wed, 19 Aug 2015 01:33:46 +0000 (01:33 +0000)]
am
caa6cb3a: am
394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
* commit '
caa6cb3a2f8118df6e14862b5977d82b32771775':
Fix race condition for doze mode and wake-and-unlocking
Chris Craik [Wed, 19 Aug 2015 01:33:04 +0000 (01:33 +0000)]
am
ca3c865d: am
892768fb: am
0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '
ca3c865da2df561f675ff4faf92e0e9b4c97ef2d':
Constrain drawBitmap matrix-to-rect optimization
Tenghui Zhu [Wed, 19 Aug 2015 01:32:58 +0000 (01:32 +0000)]
am
a2de2177: am
df23f371: am
c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
* commit '
a2de21777d26be659fe6425e9713119836634955':
Add some bookmarks to plugin-for-gradle page
Quddus Chong [Wed, 19 Aug 2015 01:32:52 +0000 (01:32 +0000)]
am
dd8ccccd: am
f17a4f42: am
54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev
* commit '
dd8ccccd839f2e21b08ba9320d35a0b0757bce2c':
docs: Updated hardware system images for M.
Adam Lesinski [Wed, 19 Aug 2015 01:32:46 +0000 (01:32 +0000)]
am
5b3a38e0: am
bda9b324: am
886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '
5b3a38e07dcdbae03f13a55d91a8936996ddc9cf':
Change default cellular activity timeout to 10
Jorim Jaggi [Wed, 19 Aug 2015 01:32:40 +0000 (01:32 +0000)]
am
b7f482ab: am
ee2cfe48: Only call authenticate when we are not listening yet
* commit '
b7f482ab41f3c50d2765c53db8b4e79f4e1b7903':
Only call authenticate when we are not listening yet
Jim Miller [Wed, 19 Aug 2015 01:32:24 +0000 (01:32 +0000)]
am
7ef77271: am
bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit '
7ef772713fac5d7b69874f2b972cdec7a60f074b':
Reset fingerprint lockout timer when strong auth is used.
Jorim Jaggi [Wed, 19 Aug 2015 01:32:06 +0000 (01:32 +0000)]
am
2591d6ff: am
358fcc79: Do not start with a black frame in bootanimation
* commit '
2591d6ffc60505df0099069877f7913ec30e4460':
Do not start with a black frame in bootanimation
Jim Miller [Wed, 19 Aug 2015 01:31:58 +0000 (01:31 +0000)]
am
e11fbc08: am
33a5c807: resolved conflicts for merge of
448216e7 to mnc-dr-dev
* commit '
e11fbc08a340cb069c8034b7ffd794c32344d4ba':
Revert "Disable fingerprint when remotely reset by DPM"
Tim Kilbourn [Wed, 19 Aug 2015 01:31:53 +0000 (01:31 +0000)]
am
9b1fd822: am
2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
* commit '
9b1fd822d07a5e3c270b76b197bec7ebfadb250d':
Use init to write usb typec props.
Roozbeh Pournader [Wed, 19 Aug 2015 01:31:43 +0000 (01:31 +0000)]
am
31a536e1: am
57928364: am
53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
* commit '
31a536e117ff750b49350d5dc7268239bfc2ff36':
Revert "Create a special CONSTRAINED font bucket in frameworks."
Dianne Hackborn [Wed, 19 Aug 2015 01:31:27 +0000 (01:31 +0000)]
am
8100b3fa: am
4439dcdc: am
af75c17b: Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
* commit '
8100b3fa8be63b5c3525997b35d216edfc0cd7e7':
Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
Jorim Jaggi [Wed, 19 Aug 2015 01:13:37 +0000 (01:13 +0000)]
am
27c1a728: am
f610bd78: Fix race conditions for camera prewarm service
* commit '
27c1a728c8dd5d9b6051d4169eb47ef16c31e5a7':
Fix race conditions for camera prewarm service
Jorim Jaggi [Wed, 19 Aug 2015 01:13:32 +0000 (01:13 +0000)]
am
0835f33a: Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev
* commit '
0835f33a4de14d62c433b36d1b08daff9166e9b3':
Improve motion for wake-and-unlocking while pulsing
Jorim Jaggi [Wed, 19 Aug 2015 01:13:28 +0000 (01:13 +0000)]
am
394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
* commit '
394686efbb51e7c05e230c4ad3695fadc3aa85a0':
Fix race condition for doze mode and wake-and-unlocking
Jorim Jaggi [Wed, 19 Aug 2015 01:08:27 +0000 (01:08 +0000)]
am
f610bd78: Fix race conditions for camera prewarm service
* commit '
f610bd78b2cf574faa197ed9f21128ac7795a407':
Fix race conditions for camera prewarm service
Jorim Jaggi [Wed, 19 Aug 2015 01:04:58 +0000 (01:04 +0000)]
Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev
Jorim Jaggi [Wed, 19 Aug 2015 01:04:54 +0000 (01:04 +0000)]
Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
Chris Craik [Wed, 19 Aug 2015 00:59:24 +0000 (00:59 +0000)]
am
892768fb: am
0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '
892768fb3efa6bde3f24ffa09a013fa76cab855e':
Constrain drawBitmap matrix-to-rect optimization
Tenghui Zhu [Wed, 19 Aug 2015 00:59:19 +0000 (00:59 +0000)]
am
df23f371: am
c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
* commit '
df23f37105747918921099e7618b4071358fac92':
Add some bookmarks to plugin-for-gradle page
Quddus Chong [Wed, 19 Aug 2015 00:59:15 +0000 (00:59 +0000)]
am
f17a4f42: am
54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev
* commit '
f17a4f4257d8e18439ba894435ba2d112e757753':
docs: Updated hardware system images for M.
Adam Lesinski [Wed, 19 Aug 2015 00:59:10 +0000 (00:59 +0000)]
am
bda9b324: am
886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '
bda9b324c88b70514109f2d9ffc937ca3202fd03':
Change default cellular activity timeout to 10
Jorim Jaggi [Wed, 19 Aug 2015 00:59:06 +0000 (00:59 +0000)]
am
ee2cfe48: Only call authenticate when we are not listening yet
* commit '
ee2cfe48d4fb36906c59c2ae545808dba01f90d8':
Only call authenticate when we are not listening yet
Jorim Jaggi [Tue, 18 Aug 2015 00:38:58 +0000 (17:38 -0700)]
Improve motion for wake-and-unlocking while pulsing
- Move all fingerprint related to logic in on central class in
SystemUI that knows all the state of the UI so there is exactly ONE
place in which we decide what to do when we acquire a fingerprint.
- When pulsing and we get a valid finger, we fade the contents of the
Keyguard out and fade the scrim out almost the same way as we would do
in a normal wake-and-unlock sequence.
- Hide shadows while dozing, so we don't see the artifacts when we fade
the dozed Keyguard out.
Bug:
23225107
Change-Id: I82f78e61f2530cf7d507ade80f6f0a340c082567
Chris Craik [Wed, 19 Aug 2015 00:54:00 +0000 (00:54 +0000)]
am
0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '
0b8045425ff58f992046ff2be35bc91001dabf7b':
Constrain drawBitmap matrix-to-rect optimization
Tenghui Zhu [Wed, 19 Aug 2015 00:53:52 +0000 (00:53 +0000)]
am
c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
* commit '
c9ecc985947462e3032fdd3b1c6abc0d5b5b1084':
Add some bookmarks to plugin-for-gradle page
Quddus Chong [Wed, 19 Aug 2015 00:53:39 +0000 (00:53 +0000)]
am
54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev
* commit '
54bdb2e732de98ae2829101570dc29970e377fa3':
docs: Updated hardware system images for M.
Adam Lesinski [Wed, 19 Aug 2015 00:53:35 +0000 (00:53 +0000)]
am
886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '
886e7a63b122a30c69c663d32e3e5f880a07593e':
Change default cellular activity timeout to 10
Jorim Jaggi [Tue, 18 Aug 2015 22:25:09 +0000 (15:25 -0700)]
Only call authenticate when we are not listening yet
Bug:
23304421
Change-Id: I5c589ba8992039ca995138d7d74abd123b911a5c
Zhentao Sun [Fri, 14 Aug 2015 22:57:18 +0000 (15:57 -0700)]
Launched camera in the correct user.
Fixed b/
23325974.
The camera was always launched in the device owner's profile. Now it can
work with secondary users.
Change-Id: I826b341a7e73a9dd603dd5df7aa31bfaf4d440c4
Jorim Jaggi [Tue, 18 Aug 2015 03:17:30 +0000 (20:17 -0700)]
Fix race conditions for camera prewarm service
When the unbind request came in before the service was actually
bound, we dropped the unbind request because mPrewarmBound was still
false. Fix that by tracking whether a bind is pending and if a unbind
event comes in during that time, set another flag to unbind it
directly again when the service is actually bound. In addition, don't
allow binding again if any of the previous events are still pending.
Bug:
23143748
Change-Id: I2b8ace86e35479a9848668a3462a2ce687835413
Chris Craik [Tue, 18 Aug 2015 23:51:11 +0000 (23:51 +0000)]
Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
Jim Miller [Tue, 18 Aug 2015 23:18:36 +0000 (23:18 +0000)]
am
bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit '
bea9d7b94cfa16da8f257ed705e218b017d459a7':
Reset fingerprint lockout timer when strong auth is used.
Tenghui Zhu [Tue, 18 Aug 2015 23:13:12 +0000 (23:13 +0000)]
Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
Jim Miller [Tue, 18 Aug 2015 23:12:18 +0000 (23:12 +0000)]
Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
Quddus Chong [Tue, 18 Aug 2015 22:03:21 +0000 (22:03 +0000)]
Merge "docs: Updated hardware system images for M." into mnc-dev
Chris Craik [Tue, 18 Aug 2015 21:52:52 +0000 (14:52 -0700)]
Constrain drawBitmap matrix-to-rect optimization
bug:
22962165
Optimization is not valid if matrix would flip image.
Change-Id: Ieee42390517bd3466b7d94596f0fbbe192ab757e
Quddus Chong [Tue, 18 Aug 2015 19:59:24 +0000 (12:59 -0700)]
docs: Updated hardware system images for M.
Change-Id: Ied1658cd2c3052e4c6cf23aa18b65b291d03dbc6
Adam Lesinski [Tue, 18 Aug 2015 20:43:34 +0000 (20:43 +0000)]
Merge "Change default cellular activity timeout to 10" into mnc-dev
Jorim Jaggi [Tue, 18 Aug 2015 20:33:08 +0000 (20:33 +0000)]
am
358fcc79: Do not start with a black frame in bootanimation
* commit '
358fcc795ea567ba086a460c587de427507fefdd':
Do not start with a black frame in bootanimation
Jorim Jaggi [Wed, 12 Aug 2015 03:23:56 +0000 (20:23 -0700)]
Do not start with a black frame in bootanimation
Bug:
23128307
Change-Id: I0ec044f983c1c30960be046e43a882c63205dc5f
Jim Miller [Tue, 18 Aug 2015 20:15:10 +0000 (20:15 +0000)]
am
33a5c807: resolved conflicts for merge of
448216e7 to mnc-dr-dev
* commit '
33a5c80773b7b2913c92fec170787499a453d184':
Revert "Disable fingerprint when remotely reset by DPM"
Jim Miller [Tue, 18 Aug 2015 20:07:25 +0000 (13:07 -0700)]
resolved conflicts for merge of
448216e7 to mnc-dr-dev
Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5
Tim Kilbourn [Tue, 18 Aug 2015 20:02:47 +0000 (20:02 +0000)]
am
2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev
* commit '
2ad94499697d79dc41489ab873527411f88b3f15':
Use init to write usb typec props.
Jim Miller [Thu, 13 Aug 2015 03:30:34 +0000 (20:30 -0700)]
Reset fingerprint lockout timer when strong auth is used.
Fixes bug
22565462
Change-Id: I4842877839845e7fe103396d8ca8104928568c04
Tim Kilbourn [Tue, 18 Aug 2015 19:54:46 +0000 (19:54 +0000)]
Merge "Use init to write usb typec props." into mnc-dr-dev
Roozbeh Pournader [Tue, 18 Aug 2015 19:44:49 +0000 (19:44 +0000)]
am
57928364: am
53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
* commit '
579283647e110538651fa812ceb15bc7f44e50a8':
Revert "Create a special CONSTRAINED font bucket in frameworks."
Roozbeh Pournader [Tue, 18 Aug 2015 19:37:16 +0000 (19:37 +0000)]
am
53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
* commit '
53c38c8819e2497f8272e7615d34aaa4ae052adf':
Revert "Create a special CONSTRAINED font bucket in frameworks."
Jim Miller [Tue, 18 Aug 2015 19:32:01 +0000 (19:32 +0000)]
Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev
Roozbeh Pournader [Tue, 18 Aug 2015 19:29:47 +0000 (19:29 +0000)]
Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
Roozbeh Pournader [Tue, 18 Aug 2015 19:17:13 +0000 (12:17 -0700)]
Revert "Create a special CONSTRAINED font bucket in frameworks."
This reverts commit
9e21eced5efacd605036be599d96974964deb09b.
Bug:
22929087
Adam Lesinski [Tue, 18 Aug 2015 18:47:07 +0000 (11:47 -0700)]
Change default cellular activity timeout to 10
LTE radios take 10 seconds to power down, so we should set the
activity timeout to 10 seconds.
Bug:
23294704
Change-Id: I7478b77f134b0fe2d82e39acd5c370add12735ca
Dianne Hackborn [Tue, 18 Aug 2015 18:41:51 +0000 (18:41 +0000)]
am
4439dcdc: am
af75c17b: Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
* commit '
4439dcdc395a9c173df1ddcf64c510eed5face07':
Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
Dianne Hackborn [Tue, 18 Aug 2015 18:33:25 +0000 (18:33 +0000)]
am
af75c17b: Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
* commit '
af75c17bca8b2f017e254131393cd72e2fe7c6e8':
Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
Dianne Hackborn [Tue, 18 Aug 2015 18:08:10 +0000 (11:08 -0700)]
Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
Change-Id: I34d4fcdc103b3a6ea5c4ed78895f2fe18597237a
Sebastien Hertz [Tue, 18 Aug 2015 08:04:41 +0000 (08:04 +0000)]
am
677cd087: am
e9de1b4c: am
9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
* commit '
677cd0872013cdeb4c201ce0994633065b616725':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Tue, 18 Aug 2015 07:56:37 +0000 (07:56 +0000)]
am
e9de1b4c: am
9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
* commit '
e9de1b4cef10922180cfe06049cf906160e2c315':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Tue, 18 Aug 2015 07:50:06 +0000 (07:50 +0000)]
am
9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
* commit '
9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Tue, 18 Aug 2015 07:41:50 +0000 (07:41 +0000)]
Merge "Allow debugging only for apps forked from zygote" into mnc-dev
Joe Fernandez [Tue, 18 Aug 2015 07:41:22 +0000 (07:41 +0000)]
am
20a9ca15: am
d294dc43: am
96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
* commit '
20a9ca1581c266ce320ea850ee6dc10719584ebf':
docs: App link doc update for M Preview 3
Joe Fernandez [Tue, 18 Aug 2015 07:36:25 +0000 (07:36 +0000)]
am
d294dc43: am
96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
* commit '
d294dc437d53ceb74529e62aa70078a8f51bb462':
docs: App link doc update for M Preview 3
Joe Fernandez [Tue, 18 Aug 2015 07:28:31 +0000 (07:28 +0000)]
am
96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
* commit '
96695d2f5961cbfac2d5c5ea6a7c03612991d5fb':
docs: App link doc update for M Preview 3
Joe Fernandez [Tue, 18 Aug 2015 07:23:35 +0000 (07:23 +0000)]
Merge "docs: App link doc update for M Preview 3" into mnc-dev
Joe Fernandez [Fri, 14 Aug 2015 10:00:27 +0000 (03:00 -0700)]
docs: App link doc update for M Preview 3
Change-Id: I9a8843bb2209f9ac12d5d0946dda1e3bdd6f1947
David Friedman [Tue, 18 Aug 2015 05:07:15 +0000 (05:07 +0000)]
am
d7792759: am
5f89ce64: am
3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
* commit '
d7792759e703200c833736df276915958588cad4':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
David Friedman [Tue, 18 Aug 2015 05:00:50 +0000 (05:00 +0000)]
am
5f89ce64: am
3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
* commit '
5f89ce649c6385bd6463641c5408cc7a274b0eb6':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
David Friedman [Tue, 18 Aug 2015 04:54:58 +0000 (04:54 +0000)]
am
3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
* commit '
3e40a27eaca9e82398f7dc59006c14e56de7cc43':
Docs: Fixing files that didn't merge properly from mnc-preview-docs
David Friedman [Tue, 18 Aug 2015 04:50:23 +0000 (04:50 +0000)]
Merge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" into mnc-dev
Filip Gruszczynski [Tue, 18 Aug 2015 02:25:00 +0000 (02:25 +0000)]
am
b59404a1: am
eb2f302d: am
610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
* commit '
b59404a1f590091f0c3cd22b69de1b55154ef580':
Clear old clip rect when creating new surface.
Jorim Jaggi [Fri, 14 Aug 2015 20:56:01 +0000 (13:56 -0700)]
Fix race condition for doze mode and wake-and-unlocking
When pulse was about to turn on and at the same time we were starting
a wake-and-unlock sequence, there was jank because the scrim handling
was not correct anymore. Now, abort the pulse when we are wake-and-
unlocking so we don't see flickering with the scrims anymore.
Bug:
23217476
Change-Id: I331f513b68fb1832b4372d3e2e518b31b556a43c
Filip Gruszczynski [Tue, 18 Aug 2015 02:19:51 +0000 (02:19 +0000)]
am
eb2f302d: am
610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
* commit '
eb2f302d119faaaf5d63f23f0921da9d756da5b4':
Clear old clip rect when creating new surface.
Filip Gruszczynski [Tue, 18 Aug 2015 02:12:47 +0000 (02:12 +0000)]
am
610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
* commit '
610008c0ebf5ea4556b4825eac521b2b16f1a66c':
Clear old clip rect when creating new surface.
Filip Gruszczynski [Tue, 18 Aug 2015 02:04:57 +0000 (02:04 +0000)]
Merge "Clear old clip rect when creating new surface." into mnc-dev
David Friedman [Tue, 18 Aug 2015 01:15:50 +0000 (18:15 -0700)]
Docs: Fixing files that didn't merge properly from mnc-preview-docs
Change-Id: If1a97d8da5a8e7f65293bc34e1a1646f06a48043
Dianne Hackborn [Tue, 18 Aug 2015 01:41:45 +0000 (01:41 +0000)]
am
5211c063: am
6da89844: am
12b9c2d6: Merge "Fix issue #
23214751: Get a GPS fix before going in to doze" into mnc-dev
* commit '
5211c0630bc5ab3026dd29e1640ddc83590e3219':
Fix issue #
23214751: Get a GPS fix before going in to doze
Dianne Hackborn [Tue, 18 Aug 2015 01:35:14 +0000 (01:35 +0000)]
am
6da89844: am
12b9c2d6: Merge "Fix issue #
23214751: Get a GPS fix before going in to doze" into mnc-dev
* commit '
6da89844d422477c0f90f3b97f96c64f3bccb3fb':
Fix issue #
23214751: Get a GPS fix before going in to doze
Chris Tate [Tue, 18 Aug 2015 01:28:13 +0000 (01:28 +0000)]
am
ccbb02f9: am
b16cd62c: am
c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
* commit '
ccbb02f9b91a2fe631487c5644996c7dde567950':
Clean up properly if outcall for doRestoreFinished() fails
Dianne Hackborn [Tue, 18 Aug 2015 01:26:10 +0000 (01:26 +0000)]
am
12b9c2d6: Merge "Fix issue #
23214751: Get a GPS fix before going in to doze" into mnc-dev
* commit '
12b9c2d6aa77d25848f81d84e34367a46d09d2af':
Fix issue #
23214751: Get a GPS fix before going in to doze
Chris Tate [Tue, 18 Aug 2015 01:21:05 +0000 (01:21 +0000)]
am
b16cd62c: am
c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
* commit '
b16cd62c676dc219c0f31495ad13aeb0381fee0e':
Clean up properly if outcall for doRestoreFinished() fails
Dianne Hackborn [Tue, 18 Aug 2015 01:17:00 +0000 (01:17 +0000)]
Merge "Fix issue #
23214751: Get a GPS fix before going in to doze" into mnc-dev
Chris Tate [Tue, 18 Aug 2015 01:13:24 +0000 (01:13 +0000)]
am
c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
* commit '
c0a2254e083f7d2f38052012363cd71d1a6657dc':
Clean up properly if outcall for doRestoreFinished() fails
Chris Tate [Tue, 18 Aug 2015 01:07:50 +0000 (01:07 +0000)]
Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
Filip Gruszczynski [Tue, 18 Aug 2015 00:42:04 +0000 (17:42 -0700)]
Clear old clip rect when creating new surface.
This fixes an issue where a window state animator holds on to old clip
rect from previous transition and applies it to the newly created surface.
Bug:
22851074
Change-Id: Ic416a2a0c5d0f69fc80d5656541256ade41c9c36
Quddus Chong [Tue, 18 Aug 2015 00:06:52 +0000 (00:06 +0000)]
am
905af2b4: am
0c61fe76: am
7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
* commit '
905af2b46285a66b4921a39f324465b727fe00bd':
docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
OSDN Git Service
