231 Commits

Author SHA1 Message Date
Adrian Roos
38dfba03d5 Merge "Add trust indicator to keyguard" 2014-05-21 14:04:43 +00:00
Brian Colonna
d9a5cfa6f7 Merge "Fix 14988763: FUL only shows on bouncer now" 2014-05-21 13:59:11 +00:00
Adrian Roos
2fe592d49b Add trust indicator to keyguard
Changes the unlock icon to an open lock
when the keyguard will not ask for credentials.

Bug: 14295559
Change-Id: If34a5ec9e23b2d22813860faee125e6b2d700643
2014-05-21 15:51:14 +02:00
Andres Morales
94a17b5f18 Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class."" 2014-05-20 23:40:37 +00:00
Andres Morales
62b25a5bf0 Revert "Adding INfcUnlockSettings and NfcUnlock interface class."
This will be re-added as a Trustlet in a subsequent CL.

This reverts commit 38a7ed05f8fed0aa81f7214d827875f9876ffbe1.

Change-Id: I5aa36df42a7751f165b4ef184e0cda57e5568b59
2014-05-20 16:59:34 +00:00
Brian Colonna
200475be8e Fix 14988763: FUL only shows on bouncer now
FUL used to show on the notification shade when returning from
something that was occluding keyguard such as navigation or
secure camera.  This fix makes FUL only display on the bouncer,
never on the notification shade.

Change-Id: I6b6dc1453a167161330132c1e2703c296050bf0e
2014-05-20 12:34:18 -04:00
Jim Miller
526ed2d7fc Fix Keyguard PIN error message for N < 4.
This fixes a bug where no error message was shown
when the user enters less than 4 digits for a PIN.

Fixes bug 14658301

Change-Id: Ia36ad205d197f0eb5f5095d71bc239ec7ded85f2
2014-05-19 11:31:08 -07:00
Adrian Roos
336be7f7a4 Improve trust handling on dimsissing keyguard
The check for whether the device is in trusted mode happened at
the wrong time previously. Now it is checked when trying to dismiss
the keyguard.

Bug: 15072996
Change-Id: I81a3793ba1cf25468d3c923b2075f4c987b79e53
2014-05-19 17:11:18 +02:00
Adrian Roos
b601162a60 Fix visibility and add bouncer event in KeyguardUpdateMonitor
Bug: 14087751
Change-Id: I45bc2213dfcce751180762d18ead0382f68cac74
2014-05-14 16:51:18 +02:00
Jorim Jaggi
67c26cba21 Merge "Handle media key events correctly on Keyguard." 2014-05-14 12:35:46 +00:00
Jorim Jaggi
df993513fb Handle media key events correctly on Keyguard.
Bug: 14490267
Change-Id: Ib8f8ee3ee7f1fbec70f1dd8b6fb04cd7c242bdce
2014-05-14 14:32:50 +02:00
Jim Miller
2e648e1ed2 Don't clear the pattern when window focus changes.
This is no longer required since we now clear the pattern field
when showing the bouncer.

Fixes bug 14622312

Change-Id: I476bbc95449cd31e56aeac579b3c94f859cd020b
2014-05-13 16:51:23 -07:00
Jim Miller
aef7cc77a8 Don't clear the password field when window focus changes.
This is no longer required since we now clear the password field
when showing the bouncer.  The code used to clear it because
keyguard was relatively static and we didn't want to keep the
password around through an interruption like a phone call or
launching the camera.

Fixes bug 14622312

Change-Id: I4808d51198ba0e6b1e03e26fee22bb08c752e613
2014-05-12 20:05:24 -07:00
Jeff Brown
fb0448ab4b resolved conflicts for merge of 4f8cd188 to master
Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3
2014-05-01 18:19:31 -07:00
Jeff Brown
4f8cd18880 am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev
* commit '7f6ab17d414726868563105cd995b37dd519320b':
  Clean up some terminology related to interactive state.
2014-05-01 23:29:13 +00:00
Jeff Brown
140ffc783c Clean up some terminology related to interactive state.
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
2014-05-01 15:22:27 -07:00
Jorim Jaggi
b039603867 Merge "Add carrier text on lockscreen in top left corner." 2014-04-28 12:18:44 +00:00
Jim Miller
66fbe3dc81 Merge "Add new DevicePolicyManager disable flags for keyguard." 2014-04-26 00:28:44 +00:00
Jim Miller
50e62183d4 Add new DevicePolicyManager disable flags for keyguard.
- KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
- KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS
- KEYGUARD_DISABLE_TRUST_AGENTS

Change-Id: I4ed2b9cef78b497d87bb719c57fabdad94c18e82
2014-04-25 13:27:10 -07:00
Jorim Jaggi
25807936e8 Add carrier text on lockscreen in top left corner.
Change-Id: I88c96eabc4b97295da5c1094db3fd22fcc637390
2014-04-25 14:18:07 +02:00
Elliott Hughes
ccec5f0def resolved conflicts for merge of 02e85744 to master
Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
2014-04-24 17:18:10 -07:00
Elliott Hughes
02e857441f am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.
2014-04-24 23:59:05 +00:00
Elliott Hughes
cacbe1b1ef Use the suggested public API instead of libcore.os.
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
2014-04-24 16:19:27 -07:00
Jorim Jaggi
fa9189fd74 Fix not being able to unlock SIM PIN.
Bug: 14120902
Change-Id: I812d9679000242eabea617ea75cf8355d16926b2
2014-04-17 20:17:30 +02:00
Jorim Jaggi
a005f1b685 Show enter PIN/PUK before notifications on Keyguard.
Change-Id: Icec12a43487fe76378e10bb8aaaa163c53b69075
2014-04-16 21:15:59 +02:00
Jorim Jaggi
e5c7a89463 Hide back button on keyguard and make it work for bouncer.
Bug: 13635952
Change-Id: Ie9824dd9926c9deb0a38c8e0a6161f605a489622
2014-04-10 21:10:22 +02:00
Jorim Jaggi
0bed7f258b Always go through bouncer when unlocking
Previously, we skipped the bouncer when the user didn't had a
security method set. Users without a security method couldn't unlock
their SIM cards though. This change moves the responsibility to
decide what to do to bouncer, so SIM pin is still shown with users
without secrity methods. The bouncer will still be skipped if no
authentication is required.

Bug: 13635952
Change-Id: I0b43628c37d769515e97c29fc5fb5337fe46526f
2014-04-05 17:05:56 +02:00
Adrian Roos
78d9aece82 am 46842d94: Make Keyguard trust aware
* commit '46842d946d1777c22f05e6bb96933c1b5cbd00d4':
  Make Keyguard trust aware
2014-03-31 19:26:14 +00:00
Adrian Roos
46842d946d Make Keyguard trust aware
Bug: 13723878
Change-Id: If1f54de4112a120848df72192b82e35b341e8ed3
2014-03-31 19:22:48 +00:00
Jorim Jaggi
5cf17879a3 Reuse KeyguardViewMediator for new Keyguard implementation.
This change reuses KeyguardViewMediator for the new Keyguard
implementation in status bar. KeyguardViewManager is replaced by
StatusBarKeyguardManager which handles adding the view, setting the
state etc. StatusBarWindowManager is introduced to managed the window
of the status bar, which has the logic of both the old Keyguard window
and the old status bar window. In the current implementation, Keyguard
gets displayed like it would be in the bouncer state, but that's likely
to change in the future. Also, setHidden in IKeyguardService is also
renamed to setOccluded, as the word hidden interferes with the
terminology when dismissing the Keyguard.

Bug: 13635952
Change-Id: I1c5d5a49d810d8532089f464cb2efe35e577f517
2014-03-31 20:58:31 +02:00
Jorim Jaggi
380ecb81db Make Keyguard a library and make StatusBar the new Keyguard.
This change achieves a couple of things:
- Let Keyguard be a library, so we can use it in SystemUI.
- Introduce FLAG_KEYGUARD for windows and deprecate TYPE_KEYGUARD. Make
all the TYPE_KEYGUARD behaviour dependant on the flag.
- Implement a new KeyguardService in SystemUI, and bind that service
from PhoneWindowManager.
- Introduce BaseStatusBar.setKeyguardState and inflate
KeyguardSimpleHostView there and use FLAG_KEYGUARD for the window, such
that the status bar window essentially gets the Keyguard.

Bug: 13635952
Change-Id: I059d80d8b9b9818a778ab685f4672ea2694def63
2014-03-28 22:35:03 +01:00
Paul Lawrence
6ee7d25010 Revert "Don't prompt at boot if we already did that when decrypting"
This reverts commit 493e3e7e6523fd94cc1acae3e45935a1227d58c3.

Should fixes

Bug: 13611885
Bug: 13656830
Change-Id: I117c988bb6679f44f8add4fcc18f45cb8238dfb4
2014-03-26 22:31:04 +00:00
Paul Lawrence
717e0f5db7 Merge "Don't prompt at boot if we already did that when decrypting" 2014-03-21 20:40:46 +00:00
Jim Miller
e397d90fbd am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE
* commit 'e0683de51e56d7a95c88c5c744f45c72a54a95bc':
  Fix the build.  DO NOT MERGE
2014-03-20 16:24:01 +00:00
Jim Miller
5837a15df1 am 1d6c2573: am aebe3b6c: am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '1d6c2573d4b2824511354d651d7350df327f454f':
  Attempt to fix a bug where SIM progress dialog gets stuck.
2014-03-20 16:10:04 +00:00
Jim Miller
aebe3b6ca4 am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit 'abde0aaa7958976b8f3a66e348d6a5152b0d838e':
  Attempt to fix a bug where SIM progress dialog gets stuck.
2014-03-20 15:47:31 +00:00
Jim Miller
e0683de51e am 37050124: am a413a4ae: Fix the build. DO NOT MERGE
* commit '370501243685a39a52b6e389b97711b906d2d4f8':
  Fix the build.  DO NOT MERGE
2014-03-20 02:47:04 +00:00
Chris Craik
dbd60a71b5 am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit '99689a6874c7c465ed97dba625d38e3f1599963f':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
2014-03-20 02:40:14 +00:00
Chris Craik
9208bb4a2b am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit '00efaea980c7a9f84f326b22aef740cb5438d282':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
2014-03-20 02:30:15 +00:00
Jim Miller
a413a4ae32 Fix the build. DO NOT MERGE
Change-Id: Ic34e351f86cfb8299b666e860c067d905cce6747
2014-03-19 18:38:09 -07:00
Jim Miller
abde0aaa79 am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '375ff2c4a7b42d6dfd333e0ffa351be88fdab034':
  Attempt to fix a bug where SIM progress dialog gets stuck.
2014-03-20 01:14:40 +00:00
Jim Miller
2598fbd71a Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev 2014-03-20 01:04:13 +00:00
Adrian Roos
70a0ea0e8d am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '16858164c73f0696d12161e97bad9cb22c55e603':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-14 16:27:51 +00:00
Paul Lawrence
493e3e7e65 Don't prompt at boot if we already did that when decrypting
vold will store password securely until KeyGuard requests it
and hands it on to KeyStore.

Needs matching vold changes from
 https://googleplex-android-review.git.corp.google.com/#/c/432050/

Bug: 12990752
Change-Id: I930ed8180cf0b8feb1e58db043d5fb6dff1bab20
2014-03-13 13:48:19 -07:00
Adrian Roos
91c9561cbe DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

Bug: 13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
2014-03-13 13:42:29 +00:00
Jim Miller
6f29b30dc2 Attempt to fix a bug where SIM progress dialog gets stuck.
The fix makes sure onPause() is called when KeyguardHostView
is removed.

Bug 10323372

Change-Id: I20dd1f68c270adbd4582f2cd8ed9b03964b4477c
2014-03-13 00:13:14 +00:00
Adrian Roos
75fc592847 Merge "Fix bug that allowed avoiding lockout if too many wrong patterns are entered." 2014-03-10 20:07:00 +00:00
Adrian Roos
7c11f8b465 Fix bug that allowed avoiding lockout if too many wrong patterns are entered.
Bug: 13302967
Change-Id: I78404acd700c338e58270471ba307dad9a6884d6
2014-03-10 17:00:11 +01:00
Adrian Roos
6d22d75cba Keyguard Analytics: Remove unused constant.
Change-Id: I6fce6640e391d5f78468212aac7d14a8a6170115
2014-03-03 17:53:44 +01:00
Adrian Roos
58b58fe68b Add session analytics to Keyguard.
On eng and userdebug builds, adds the possibility to track touch and sensor events on the Keyguard.

Change-Id: I9ff9fe5545cb9b7e6833a6af0b5a97a6c204dbd2
2014-03-03 17:09:27 +01:00