Geoff Mendal
14af6c50c3
Merge "Import translations. DO NOT MERGE"
2015-08-19 12:53:52 +00:00
Geoff Mendal
9ad926d011
Import translations. DO NOT MERGE
...
Change-Id: I94432e596e46517d184b195e388af9ace8ac82dc
Auto-generated-cl: translation import
2015-08-19 05:50:29 -07:00
Geoff Mendal
caed5d8634
Merge "Import translations. DO NOT MERGE"
2015-08-19 12:34:40 +00:00
Geoff Mendal
3ca63ce0a8
Import translations. DO NOT MERGE
...
Change-Id: Ic7efed73c357ab804e18094702e7f0ca29bcff66
Auto-generated-cl: translation import
2015-08-19 05:32:43 -07:00
Geoff Mendal
319cc0ce10
Import translations. DO NOT MERGE
...
Change-Id: I1c57278b5b481e1e737f38b8361ef362ed3f83d4
Auto-generated-cl: translation import
2015-08-19 05:07:32 -07:00
Jorim Jaggi
077473fcc6
am 44ad8a51: am 6ac4af0f: am 8cc1abcb: am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided
...
* commit '44ad8a51158e2712f2400276cdf8faacb4c1454b':
Fix SysUI crash when no metadata is provided
2015-08-19 03:10:27 +00:00
Jorim Jaggi
8385419883
am 42904b65: am 43fdc250: am e6c029b4: am 27c1a728: am f610bd78: Fix race conditions for camera prewarm service
...
* commit '42904b65535430732f05ddf7271b1da83e5f2f0a':
Fix race conditions for camera prewarm service
2015-08-19 03:09:27 +00:00
Jorim Jaggi
0772bfd206
"resolved conflicts for merge of caacc8ba to master"
...
Change-Id: I7904ac66ded45c3173af14d2940dc8210088e387
2015-08-18 20:04:01 -07:00
Jorim Jaggi
44ad8a5115
am 6ac4af0f: am 8cc1abcb: am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided
...
* commit '6ac4af0f4b31d3e33863263509d5a05bfc84d273':
Fix SysUI crash when no metadata is provided
2015-08-19 02:42:47 +00:00
Jorim Jaggi
6ac4af0f4b
am 8cc1abcb: am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided
...
* commit '8cc1abcb7fdebcfd777bfbfc7b905bd9276bbb7c':
Fix SysUI crash when no metadata is provided
2015-08-19 02:35:26 +00:00
Jorim Jaggi
8cc1abcb7f
am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided
...
* commit 'b960e75e52176bc4edc709aba71535b32e2d9970':
Fix SysUI crash when no metadata is provided
2015-08-19 02:27:04 +00:00
Jorim Jaggi
f0c28807a0
am 72964a37: am 1dc1c93b: am caa6cb3a: am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
...
* commit '72964a37e090b17d8dabb05cc7f779237a5f3572':
Fix race condition for doze mode and wake-and-unlocking
2015-08-19 02:22:40 +00:00
Jorim Jaggi
e6cfa30631
am 620a31d9: am 40c75831: am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet
...
* commit '620a31d948bba714c309c3bb5abba7733eee0fe5':
Only call authenticate when we are not listening yet
2015-08-19 02:22:06 +00:00
Jim Miller
4ea5152bd8
am 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
...
* commit '849b9e58d6775a393f7d86a6305b658c6af9d16f':
Reset fingerprint lockout timer when strong auth is used.
2015-08-19 02:21:58 +00:00
Jim Miller
10fe83a9b9
am 8978d9ac: am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
* commit '8978d9acbaaa89be3c14ed758e7c8a8d06071779':
Revert "Disable fingerprint when remotely reset by DPM"
2015-08-19 02:21:46 +00:00
Jorim Jaggi
b960e75e52
am 8b8fa3e9: Fix SysUI crash when no metadata is provided
...
* commit '8b8fa3e934e3ddf01790e647b4401dc88b24bf67':
Fix SysUI crash when no metadata is provided
2015-08-19 02:20:10 +00:00
Jorim Jaggi
42904b6553
am 43fdc250: am e6c029b4: am 27c1a728: am f610bd78: Fix race conditions for camera prewarm service
...
* commit '43fdc250fcfc0c86613a0be8dbb964d3380ac35c':
Fix race conditions for camera prewarm service
2015-08-19 01:44:00 +00:00
Jorim Jaggi
caacc8ba5e
am f10e475d: am ebcd9d55: am 0835f33a: Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev
...
* commit 'f10e475d85a584e07bf74cc4d47ee4176ed543f8':
Improve motion for wake-and-unlocking while pulsing
2015-08-19 01:43:54 +00:00
Jorim Jaggi
72964a37e0
am 1dc1c93b: am caa6cb3a: am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
...
* commit '1dc1c93b9347380064c183398bb0441d99a33bf3':
Fix race condition for doze mode and wake-and-unlocking
2015-08-19 01:43:47 +00:00
Jorim Jaggi
620a31d948
am 40c75831: am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet
...
* commit '40c758316302851a99cf6e285ed7b06497ac36f9':
Only call authenticate when we are not listening yet
2015-08-19 01:43:20 +00:00
Jim Miller
849b9e58d6
am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
...
* commit 'ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034':
Reset fingerprint lockout timer when strong auth is used.
2015-08-19 01:43:12 +00:00
Jim Miller
8978d9acba
am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
* commit '309fef16e1494c80a54cbd0a59a98f32c512f845':
Revert "Disable fingerprint when remotely reset by DPM"
2015-08-19 01:43:02 +00:00
Jorim Jaggi
8b8fa3e934
Fix SysUI crash when no metadata is provided
...
Bug: 23327474
Change-Id: I4903c0812c9677e1b31e1f645e3d6f1a03150c38
2015-08-19 01:34:33 +00:00
Jorim Jaggi
43fdc250fc
am e6c029b4: am 27c1a728: am f610bd78: Fix race conditions for camera prewarm service
...
* commit 'e6c029b48d18524dbc107939bb28e8efe46bfb34':
Fix race conditions for camera prewarm service
2015-08-19 01:33:57 +00:00
Jorim Jaggi
f10e475d85
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
2015-08-19 01:33:52 +00:00
Jorim Jaggi
1dc1c93b93
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
2015-08-19 01:33:46 +00:00
Jorim Jaggi
40c7583163
am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet
...
* commit 'b7f482ab41f3c50d2765c53db8b4e79f4e1b7903':
Only call authenticate when we are not listening yet
2015-08-19 01:32:40 +00:00
Jim Miller
ce6fb7bba9
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.
2015-08-19 01:32:24 +00:00
Jim Miller
309fef16e1
am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
* commit 'e11fbc08a340cb069c8034b7ffd794c32344d4ba':
Revert "Disable fingerprint when remotely reset by DPM"
2015-08-19 01:31:58 +00:00
Jorim Jaggi
e6c029b48d
am 27c1a728: am f610bd78: Fix race conditions for camera prewarm service
...
* commit '27c1a728c8dd5d9b6051d4169eb47ef16c31e5a7':
Fix race conditions for camera prewarm service
2015-08-19 01:13:37 +00:00
Jorim Jaggi
ebcd9d558f
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
2015-08-19 01:13:32 +00:00
Jorim Jaggi
caa6cb3a2f
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
2015-08-19 01:13:28 +00:00
Jorim Jaggi
27c1a728c8
am f610bd78: Fix race conditions for camera prewarm service
...
* commit 'f610bd78b2cf574faa197ed9f21128ac7795a407':
Fix race conditions for camera prewarm service
2015-08-19 01:08:27 +00:00
Jorim Jaggi
0835f33a4d
Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev
2015-08-19 01:04:58 +00:00
Jorim Jaggi
394686efbb
Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
2015-08-19 01:04:54 +00:00
Jorim Jaggi
b7f482ab41
am ee2cfe48: Only call authenticate when we are not listening yet
...
* commit 'ee2cfe48d4fb36906c59c2ae545808dba01f90d8':
Only call authenticate when we are not listening yet
2015-08-19 00:59:06 +00:00
Jorim Jaggi
83eb6bb5d8
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
2015-08-18 17:57:10 -07:00
Jorim Jaggi
ee2cfe48d4
Only call authenticate when we are not listening yet
...
Bug: 23304421
Change-Id: I5c589ba8992039ca995138d7d74abd123b911a5c
2015-08-19 00:51:23 +00:00
Jorim Jaggi
716a734eec
Fix trigger sensor lifecycle
...
Make sure the mRegistered flag is updated early enough, so we don't
call cancel if we are not registered.
Bug: 23105138
Change-Id: I1feeab9ea3d0ca31eb5deaab97f6de2cfc4c3b3d
2015-08-19 00:07:45 +00:00
Jorim Jaggi
f610bd78b2
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
2015-08-19 00:01:45 +00:00
Jim Miller
7ef772713f
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.
2015-08-18 23:18:36 +00:00
Jim Miller
bea9d7b94c
Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
2015-08-18 23:12:18 +00:00
Fyodor Kupolov
06f5e07a54
Merge "Show guest notification on each user switch"
2015-08-18 21:16:22 +00:00
Jun Mukai
ab33469710
Merge "Make VolumeDialog respect the mouse cursor."
2015-08-18 20:24:44 +00:00
Jim Miller
e11fbc08a3
am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
* commit '33a5c80773b7b2913c92fec170787499a453d184':
Revert "Disable fingerprint when remotely reset by DPM"
2015-08-18 20:15:10 +00:00
Jim Miller
33a5c80773
resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5
2015-08-18 13:07:25 -07:00
Jim Miller
e0507bbbf9
Reset fingerprint lockout timer when strong auth is used.
...
Fixes bug 22565462
Change-Id: I4842877839845e7fe103396d8ca8104928568c04
2015-08-18 13:01:31 -07:00
Fyodor Kupolov
ce161861c3
Show guest notification on each user switch
...
Change-Id: I572ee347a4059789a67f6da4da008a293bcb3596
2015-08-18 12:41:52 -07:00
Jim Miller
448216e7b8
Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev
2015-08-18 19:32:01 +00:00
Jason Monk
4e77e3ff0b
Merge "Some QS refactoring"
2015-08-18 19:24:33 +00:00