571 Commits

Author SHA1 Message Date
John Spurlock
2396e29d31 am ae3f7cca: Merge "Add app_name to keyguard package."
* commit 'ae3f7cca5235b9c3da080e7f8210a21ecf48285b':
  Add app_name to keyguard package.
2014-04-11 18:48:17 +00: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
John Spurlock
99155e257e Add app_name to keyguard package.
Bad label referenced in the manifest.  Found while listing
installed packages in settings.

Change-Id: Ieb4a764d2a8e7f27245ce2c41998cdc77ecead92
2014-04-10 10:31:31 -04: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
Jorim Jaggi
03c701ec58 Basic implementation for notifications on lockscreen.
This change makes PhoneStatusBar expand while the lockscreen is
showing. Further, the KeyguardSimpleHostView is shown by
KeyguardBouncer, and the Bouncer is shown whenever the user tries to
unlock the phone (closing the shade).

Bug: 13635952
Change-Id: I4354b7a7937af6e1c93abf16ad6e485376d16bc2
2014-04-05 16:50:36 +02:00
Baligh Uddin
e1301a5424 Merge "Import translations. DO NOT MERGE" 2014-04-04 14:22:54 +00:00
Alan Viverette
3a3395042e am b325345e: Merge "Switch framework Holo references to Quantum.Light"
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
  Switch framework Holo references to Quantum.Light
2014-04-02 22:18:59 +00:00
Baligh Uddin
fc17e2d211 Import translations. DO NOT MERGE
Change-Id: I612d2477b77f8a69c502f42abcb34bb634e24d34
Auto-generated-cl: translation import
2014-04-02 08:38:16 -07:00
Alan Viverette
6259933ec9 Switch framework Holo references to Quantum.Light
Change-Id: Ib545a143f1959b6104adbc9d594dd626851d90b3
2014-04-01 14:57:39 -07:00
Paul Lawrence
df42723d6b Merge "Don't double prompt on booting encrypted device" 2014-04-01 15:07:10 +00:00
Jorim Jaggi
8533b95b4c Merge "Switch to KeyguardHostView to reenable clock and multi user switch." into master-lockscreen-dev 2014-03-31 19:45:11 +00:00
Adrian Roos
c316f614b9 am a3dafcfb: Add a SampleTrustAgent
* commit 'a3dafcfb26117e3a2efa3983bd7ba79ae6831680':
  Add a SampleTrustAgent
2014-03-31 19:32:11 +00:00
Adrian Roos
a3dafcfb26 Add a SampleTrustAgent
Adds a simple app that shows how to build a trust agent. For
lack of a better place to put this, this stays in Keyguard's tests
for now.

Bug: 13723878
Change-Id: I9ebad253d3d89c846fe8afaad6babce9e7b80b5e
2014-03-31 19:27:52 +00: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
13b67a9cd5 Switch to KeyguardHostView to reenable clock and multi user switch.
Bug: 13635952
Change-Id: I8996dd55be220637bc028cfedc62583850a538a2
2014-03-31 21:14:38 +02:00
Jorim Jaggi
d529e294ae Merge "Reuse KeyguardViewMediator for new Keyguard implementation." into master-lockscreen-dev 2014-03-31 19:11:32 +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
Alexandra Gherghina
053cee7822 am bd6738b2: Merge "Mark the keyguard package as required for profile"
* commit 'bd6738b2e11b8861cb4a420f437343b3c80a21c9':
  Mark the keyguard package as required for profile
2014-03-31 16:22:01 +00:00
Alexandra Gherghina
d4749eb4a8 Mark the keyguard package as required for profile
Change-Id: I8edae23c57e1f1af2c086c0f67d9d240d3726d84
2014-03-31 16:15:40 +01: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
945490c12e Don't double prompt on booting encrypted device
vold will store password securely until KeyGuard requests it
and hands it on to KeyStore.

This is a revision of

https://googleplex-android-review.git.corp.google.com/#/c/418123/

which was reverted. It had two bugs in LockSettingsService.checkVoldPassword.
1) We were not checking password for null, which caused an exception
2) checkPattern/checkPassword return true if there is no saved pattern or password.
   This leads to situations where we get true returned even when the password
   doesn't match. Call the correct one based on what is there, not what vold
   thinks ought to be there.

Bug: 12990752
Change-Id: I05315753387b1e508de5aa79b5a68ad7315791d4
2014-03-28 10:35:44 -07:00
Paul Lawrence
c039034b7e am 6ee7d250: Revert "Don\'t prompt at boot if we already did that when decrypting"
* commit '6ee7d25010d4f23b44a151f3953225ba253de8af':
  Revert "Don't prompt at boot if we already did that when decrypting"
2014-03-27 01:45:40 +00: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
Baligh Uddin
6eb2518f00 Import translations. DO NOT MERGE
Change-Id: I9fb553560b84de86660b0371fb3c03b903224acb
Auto-generated-cl: translation import
2014-03-24 09:42:35 -07: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
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
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
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
375ff2c4a7 am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '2598fbd71a2109ab307d32935a13fa1eab150e8d':
  Attempt to fix a bug where SIM progress dialog gets stuck.
2014-03-20 01:08:43 +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
Geoff Mendal
d027b6ac95 Import translations. DO NOT MERGE
Change-Id: Ifbc42b448dd9a92fce471716061797ba608cfd76
Auto-generated-cl: translation import
2014-03-17 09:29:38 -07: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
16858164c7 am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit 'cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440':
  DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-13 17:26:26 +00: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
Baligh Uddin
00941b1f3b Import translations. DO NOT MERGE
Change-Id: I3c777c8e830dd7339e4b5e235756bf10a49a0627
Auto-generated-cl: translation import
2014-02-26 09:12:17 -08:00
Jim Miller
cfa68b977c Disable simple keyguard when notifications enabled.
Enabling notifications on keyguard tripped keyguard into simple
mode which isn't ready for prime-time.  Disabled with variable.

Fixes bug 13172958

Change-Id: Ia281b06d754cd62455010f9e31c0ee81e4937977
2014-02-25 15:36:13 -08:00
Dan Sandler
2b733f85e2 Merge "Fix boot crash on devices defaulting to landscape." 2014-02-25 18:59:31 +00:00
Dan Sandler
ef1bcec0f5 Fix boot crash on devices defaulting to landscape.
This is probably not what keyguard_simple_host_view should
look like in landscape, but we need the resource.

Bug: 13185323
Change-Id: Ib044db1f86510128d27ecf45546398c7c1b81aa4
2014-02-25 12:11:05 -05:00
Kenny Guy
1a447535ce Hide managed profiles from user switchers.
Hide managed profiles from lockscreen user switcher on tablets.
Hide managed profiles from power menu user switcher on phones.
Add flag to enable multi user ui turned off by default.

Change-Id: I4c69a6f7b0f39c249fc85fd940318df1ddab073f
2014-02-24 19:24:42 +00:00
Baligh Uddin
da799ef3a0 Import translations. DO NOT MERGE
Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7
Auto-generated-cl: translation import
2014-02-19 18:54:52 -08:00
Dan Sandler
5d7c3cc66c Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
$ adb shell settings put global lock_screen_show_notifications 1

Previously a per-user secure setting
(Settings.Secure.LOCK_SCREEN_ALLOW_NOTIFICATIONS), but this
doesn't really make a lot of sense since this behavior
pertains to areas of the system (keyguard, status bar) that
exist outside of any one user.

This setting now effectively enables notifications on the
secure lockscreen for all users.

Change-Id: I9c5179498dbbba9343184efdedb1587ea862cf96
2014-02-18 17:35:15 -05:00