drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,423 Commits 1 Branch 0 Tags
Commit Graph

782 Commits

Author SHA1 Message Date
Baligh Uddin
e1301a5424 Merge "Import translations. DO NOT MERGE" 2014-04-04 14:22:54 +00:00
Alan Viverette
01cefbc5b3 am b325345e: Merge "Switch framework Holo references to Quantum.Light" 
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
  Switch framework Holo references to Quantum.Light
 2014-04-02 22:23:17 +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
da7ff92c48 am df42723d: Merge "Don\'t double prompt on booting encrypted device" 
* commit 'df42723d6b717fd2882c98c930a0f93c75af2474':
  Don't double prompt on booting encrypted device
 2014-04-01 15:11:31 +00: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
66b585f268 am a3dafcfb: Add a SampleTrustAgent 
* commit 'a3dafcfb26117e3a2efa3983bd7ba79ae6831680':
  Add a SampleTrustAgent
 2014-03-31 19:31:46 +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
e5bfd6d7ce am 46842d94: Make Keyguard trust aware 
* commit '46842d946d1777c22f05e6bb96933c1b5cbd00d4':
  Make Keyguard trust aware
 2014-03-31 19:26:01 +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
b187909c08 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:19 +00: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
96a6b115c1 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-26 23:43:32 +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
81d63c442b am 717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting" 
* commit '717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
  Don't prompt at boot if we already did that when decrypting
 2014-03-21 13:45:20 -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
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
dc7eb89920 am 5837a15d: 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 '5837a15df189968be7cc0c48dbc91f1fd83885fc':
  Attempt to fix a bug where SIM progress dialog gets stuck.
 2014-03-20 09:19:51 -07: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
d4541e882d am dbd60a71: am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit 'dbd60a71b5d7ac55a91ccd938121e133e17ed0cb':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-19 20:33:13 -07: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
3705012436 am a413a4ae: Fix the build. DO NOT MERGE 
* commit 'a413a4ae3280be6c45e84e85d7be3379a5cb51e4':
  Fix the build.  DO NOT MERGE
 2014-03-20 01:49:31 +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
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
29781101d6 am 75fc5928: Merge "Fix bug that allowed avoiding lockout if too many wrong patterns are entered." 
* commit '75fc5928474c8a5ffbec76c9595df9427109f13a':
  Fix bug that allowed avoiding lockout if too many wrong patterns are entered.
 2014-03-10 13:09:17 -07: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