1903 Commits

Author SHA1 Message Date
Daniel Sandler
52070c1a71 Merge "PUK support." into jb-mr1-lockscreen-dev 2012-11-01 21:44:32 -07:00
Jim Miller
d6c48847ba Fix whitespace problem and sync with prototype.
Change-Id: I92b26741b84dcccb75783f0f26e6d84d0083b77b
2012-11-01 21:40:47 -07:00
Daniel Sandler
23d7a6e605 PUK support.
Bug: 7413109
Change-Id: I7ccfe79a17fd9b1273bc0ac821ac0e2884ae7ab2
Proto-Id: Ie49c04cf3d373e57ef0bbfd0c59589fe905c8aae
2012-11-02 00:21:07 -04:00
Daniel Sandler
261b18aaec Fix build.
Change-Id: Id7907dc9ab10e2aab07ba3cb02b4a3a27131f4cd
2012-11-01 23:54:03 -04:00
Daniel Sandler
b30ddd99af Merge "SIM PIN support." into jb-mr1-lockscreen-dev 2012-11-01 19:58:23 -07:00
Daniel Sandler
53149e69e9 SIM PIN support.
Bug: 7413109
Change-Id: Icc4157bd869c3661e7291fe8060c82d3f713445c
Proto-Id: I909ff4fdde82f3dc0c7a61d45c522844efcbe882
2012-11-01 22:05:48 -04:00
Michael Jurka
9de90c1c57 Merge "Use clock's widget as the default keyguard widget" into jb-mr1-lockscreen-dev 2012-11-01 18:59:54 -07:00
Michael Jurka
67a871d857 Use clock's widget as the default keyguard widget
Also, if we have no widgets in lockscreen,
reinflate the default widget. If that fails,
inflate the built-in clock (KeyguardStatusView)

Change-Id: I2e90ab0893c993a755700e075e4a8ac5a685e0f2
2012-11-01 18:50:21 -07:00
Jim Miller
324545d7c8 Merge "Add configurable em-dash separator for all concatenated keyguard strings" into jb-mr1-lockscreen-dev 2012-11-01 18:17:51 -07:00
Jim Miller
e9be140771 Add configurable em-dash separator for all concatenated keyguard strings
Fixes bug 7459426

Change-Id: I2e4944f25f3e4e62b734bc57db628f1b3ce263cd
2012-11-01 18:16:37 -07:00
Winson Chung
b1260af2f5 Merge "Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)" into jb-mr1-lockscreen-dev 2012-11-01 18:13:01 -07:00
Daniel Sandler
ebbf5eea2b Merge changes Ib3133583,I0262172d into jb-mr1-lockscreen-dev
* changes:
  Show "wrong password" on password screen, not "wrong PIN"
  Restore incorrect-PIN lockouts.
2012-11-01 18:09:14 -07:00
Winson Chung
e72855e670 Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
Change-Id: I28ebbd04d90a1ea2a721c28d3bce7ccea31a33e9
2012-11-01 18:05:52 -07:00
Adam Powell
9c2c77f8bd Keyguard - fix overzealous sliding security view
Bug 7453429

Change the detection of sliding the security view to require crossing
the border between sections in the correct direction. This also
improves the feel of re-opening the slider.

Change-Id: I57797f926e017ea2cf41f7c48e0fe77ac0f78460
2012-11-01 14:54:45 -07:00
Adam Powell
1dd84d5f2f Merge "Keyguard sliding challenge - fix overeager touch interception" into jb-mr1-lockscreen-dev 2012-11-01 13:51:52 -07:00
Adam Powell
c238af5112 Keyguard sliding challenge - fix overeager touch interception
Bug 7458287

Change-Id: I31f196539eecab1df5835e8ac1a76d9732a332fe
2012-11-01 13:47:02 -07:00
Danielle Millett
998a504ca9 Merge "Showing message when max attempts are hit in face unlock fixes b/7306168" into jb-mr1-lockscreen-dev 2012-11-01 13:45:28 -07:00
Brian Colonna
d4a3e5d711 Only suppressing FUL on boot if selected fixes b/7338965
FUL is suppressed when first booted and unsuppressed when the user
leaves keyguard (by logging in or turning the screen off).  However,
if the user managed to enter the phone without going through
keyguard (security set to none, or initial device setup), FUL was
not being unsuppressed and it would not show up the first time the
user tried to use it.

This fix only suppresses FUL on first boot if it is the selected
security method.  Therefore, it is not suppressed the first time it
is used after setting it up.

Change-Id: I766bbce31ce3939de97661623fe3b8d3fa29c20d
2012-11-01 16:20:24 -04:00
Daniel Sandler
16d9092314 Show "wrong password" on password screen, not "wrong PIN"
Bug: 7452916
Change-Id: Ib31335837834dbf47bd55230a526151a502d9467
2012-11-01 16:19:14 -04:00
Daniel Sandler
6a64ac56b7 Restore incorrect-PIN lockouts.
Bug: 7433439
Change-Id: I0262172db7c150aa9e73b932cc43a691f3ef9444
2012-11-01 16:19:13 -04:00
Svetoslav Ganov
8f7e1be4b1 Merge "Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b." into jb-mr1-lockscreen-dev 2012-11-01 12:30:39 -07:00
Svetoslav Ganov
0f87a72d59 Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
Change-Id: I807733dabc18bc8894c777d19c4d0e3ca809476c
2012-11-01 12:14:53 -07:00
Danielle Millett
1625e87e60 Showing message when max attempts are hit in face unlock fixes b/7306168
Added a check in pattern and PIN to showed the face unlock max attempts
failure message if that had been reached.  The max attempts can only
be true if face unlock is enabled so it doesn't need to also check if it's
enabled.

Change-Id: If8a26498961d79fa6a647abc923c72f0af407e61
2012-11-01 15:00:12 -04:00
John Spurlock
22ad682ad7 Merge "Cancel camera launch on screen off." into jb-mr1-lockscreen-dev 2012-11-01 10:05:40 -07:00
John Spurlock
dbe24b7def Cancel camera launch on screen off.
Bug: 7452793
Change-Id: Ic043a0076154d2ce4dcb0b26bae3958c35a6cd67
2012-11-01 13:01:05 -04:00
Daniel Sandler
62e9c05774 Merge "Show the keyboard less aggressively." into jb-mr1-lockscreen-dev 2012-11-01 09:56:17 -07:00
John Spurlock
6e36f1019c Fix launcher flash during secure camera transition.
Bug:7452928
Change-Id: I8b7d9bdb14addefb9e9ed71a45d438418b3e21dd
2012-11-01 09:15:53 -04:00
Danielle Millett
080471e410 Merge "Updating isShowing during onResume()" into jb-mr1-lockscreen-dev 2012-10-31 21:44:05 -07:00
Danielle Millett
5d2404da57 Updating isShowing during onResume()
Since the callback is unregistered in onPause(), KeyguardFaceUnlock
doesn't get onKeyguardVisibilityChanged() when it's paused.  This means
that if the state changes while it's paused, then mIsShowing is incorrect
when it resumes.  This is fixed by keeping track of the state in
KeyguardUpdateMonitor and checking it when onResume() is called.

Change-Id: I67aa1e091161a965e4347dc8c2ec5e7a1dd9d92e
2012-11-01 00:05:27 -04:00
Brian Colonna
9986b2d285 Merge "Suppressing FUL after going to backup fixes b/7449820" into jb-mr1-lockscreen-dev 2012-10-31 20:19:23 -07:00
Brian Colonna
667b5d58b9 Suppressing FUL after going to backup fixes b/7449820
Face Unlock would reappear when rotating a tablet after it had already
fallen back to the backup unlock method.  This change suppresses Face
Unlock after going to the backup so it isn't seen again until the user
leaves and revisits keyguard.

This change also removes the exposeFallback() callback from Face
Unlock.  It has been unnecessary for a long tiem since Face Unlock no
longer covers the backup.  The Face Unlock service was therefore
making unnecesaary calls via the AIDL interface.

Note that the AIDL interface change broke obsolete keyguard stuff.
That is being deleted soon anyway, so code has just been commented out
of the obsolete files to make it compile.

Change-Id: Ia5c451cce1703b3bc03e27a35c6b38373e944d1b
2012-10-31 23:07:00 -04:00
Svetoslav Ganov
45942ca052 Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
Change-Id: I4e9cf37aba287f079be18e5c2c25216e6fdd1396
2012-10-31 19:46:24 -07:00
Jim Miller
11952e73af Merge "Adding a button for expanding the clock screen challenge." into jb-mr1-lockscreen-dev 2012-10-31 18:54:38 -07:00
Svetoslav Ganov
74bdd21629 Adding a button for expanding the clock screen challenge.
Change-Id: Ia39303012251cf7cc4dadac030d1aa471ceff776
2012-10-31 18:25:16 -07:00
Brian Colonna
a6314da24e Merge "FUL being unsuppressed when screen turns off fixes b/7453702" into jb-mr1-lockscreen-dev 2012-10-31 18:15:36 -07:00
Svetoslav Ganov
c4842c1193 Accessibility support for the lockscreen - phone.
Change-Id: Idc99f1322a1d635dd07e1f5efa1665a4676267c2
2012-10-31 17:49:10 -07:00
Michael Jurka
c8dc8eb327 Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev 2012-10-31 17:10:11 -07:00
Brian Colonna
078f5919a9 FUL being unsuppressed when screen turns off fixes b/7453702
We suppress FUL when the device first boots because with all of the
things happening at boot, we don't want to interact with the camera.
We also suppress it immediately after a user switch for the same
reasons.  However, once the user turns the screen off, we want to
show FUL when they turn it back on.  Prior to this fix it was only
being unsuppressed on login.

Note that this CL also removes the isFirstBoot flag.  It was only
being set/checked when the suppress flag was set/checked, so it was
redundant.

This also addresses bug b/7450665, which is regarding the
user-switch case.

Change-Id: I2b39e85e21c08ef7629398521ab1159f5a6c7547
2012-10-31 20:03:18 -04:00
Adam Powell
077105bae3 Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev 2012-10-31 17:01:32 -07:00
Adam Powell
fa668cc930 Fix some drag behavior bugs in keyguard
Integrate from proto app

Make sure you can drag back up immediately without the delay of extra
offset on the challenge view.

There are still a few further tweaks to make here that will be
dependent on another upcoming patch.

Change-Id: I6af599e43d6be6da7b431dca5b87e39c157a54df
2012-10-31 17:01:38 -07:00
Michael Jurka
fc753c0cf6 Use new keyguard appwidget picker
Also, remove ability to filter widgets by feature
in appwidget picker in anticipation of api change

Change-Id: I325de0b98f03d3a250758d504229ea27794b5330
2012-10-31 16:53:04 -07:00
Jeff Brown
409c89c358 am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
* commit 'c1c53e56fb5222bfdd17f0a9f735efe5c1b8cb70':
  Fix dream/keyguard infinite layout loop.
2012-10-31 16:45:01 -07:00
Jeff Brown
c1c53e56fb Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev 2012-10-31 16:42:26 -07:00
Svetoslav Ganov
cdb80888b7 Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev 2012-10-31 15:06:32 -07:00
Jim Miller
170c8d930e Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev 2012-10-31 12:37:54 -07:00
Jim Miller
03633d28db Remove extra KeyguardViewStateManager construction
Change-Id: I0f64569876d923c2b4b7ac3918f3a0458a56b16c
2012-10-31 12:35:45 -07:00
Chris Wren
c345146a3a Update bouncer behavior on tablets.
Bug: 7411293
Change-Id: I1000987b9b5d481d04e095c4f8eb9eda44a81021
Proto:Id: I81fcf3541a81812b212963a5c4b379424506bc5a
2012-10-31 15:31:20 -04:00
Dave Burke
86e1b96666 Fix ordering bug
Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
2012-10-30 21:45:12 -07:00
Adam Powell
e74fcc0eb1 Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev 2012-10-30 21:00:40 -07:00
Adam Powell
cdf8b48745 Fix keyguard bugs
Integrate from proto app

Get some layout/alignment right between security views, bouncer,
etc. Expand the space available for the more cramped security views
when not in the bouncer.

Fix bug 7434391 - don't allow widget swiping in bouncer mode. Fix a
few other bouncer-related state tracking problems as well.

Use layers when moving the security view around.

Change-Id: Ied14bab8bb5c3d997c734a3ae657b766c427253f
2012-10-30 20:57:10 -07:00