| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2014-05-21 | 56 | -5/+62 |
| |\ | |||||
| | * | Import translations. DO NOT MERGE | Baligh Uddin | 2014-05-20 | 56 | -5/+62 |
| * | | Merge "Add trust indicator to keyguard" | Adrian Roos | 2014-05-21 | 2 | -0/+12 |
| |\ \ | |||||
| | * | | Add trust indicator to keyguard | Adrian Roos | 2014-05-21 | 2 | -0/+12 |
| * | | | Merge "Fix 14988763: FUL only shows on bouncer now" | Brian Colonna | 2014-05-21 | 1 | -28/+57 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | Fix 14988763: FUL only shows on bouncer now | Brian Colonna | 2014-05-20 | 1 | -28/+57 |
| * | | | Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class."" | Andres Morales | 2014-05-20 | 3 | -42/+1 |
| |\ \ \ | |||||
| | * | | | Revert "Adding INfcUnlockSettings and NfcUnlock interface class." | Andres Morales | 2014-05-20 | 3 | -42/+1 |
| | | |/ | |/| | |||||
| * | | | Fix Keyguard PIN error message for N < 4. | Jim Miller | 2014-05-19 | 1 | -8/+10 |
| |/ / | |||||
| * | | Improve trust handling on dimsissing keyguard | Adrian Roos | 2014-05-19 | 2 | -3/+6 |
| * | | Merge "Position clock and notifications dynamically." | Jorim Jaggi | 2014-05-17 | 5 | -10/+10 |
| |\ \ | |||||
| | * | | Position clock and notifications dynamically. | Jorim Jaggi | 2014-05-17 | 5 | -10/+10 |
| * | | | Enforce that trust agents declare the BIND_TRUST_AGENT permission | Adrian Roos | 2014-05-17 | 1 | -0/+1 |
| |/ / | |||||
| * | | Apply revised TrustAgent API | Adrian Roos | 2014-05-16 | 3 | -10/+9 |
| * | | merge master nova by hand, skipped translations | Ed Heyl | 2014-05-14 | 56 | -62/+5 |
| |\ \ | |/ |/| | |||||
| | * | am c1c89ade: Merge "Move Carrier label into universal status bar header." | Jorim Jaggi | 2014-05-09 | 1 | -1/+1 |
| | |\ | |||||
| | * \ | am a2e10038: Merge "Never close Keyguard automatically." | Jorim Jaggi | 2014-05-06 | 1 | -1/+1 |
| | |\ \ | |||||
| | * \ \ | am 61700e82: Merge "Fix padding for SIM pin entry." | Jorim Jaggi | 2014-05-02 | 3 | -22/+26 |
| | |\ \ \ | |||||
| | * \ \ \ | am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master" | Jeff Brown | 2014-05-02 | 1 | -3/+3 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | am ed8b4ca0: Merge "Layout notifications on top and introduce artifical margin" | Jorim Jaggi | 2014-04-30 | 3 | -3/+3 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | am 3daa96f4: Merge "Add carrier text on lockscreen in top left corner." | Jorim Jaggi | 2014-04-28 | 3 | -2/+16 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | am 427b7fb5: Merge "Add new DevicePolicyManager disable flags for keyguard." | Jim Miller | 2014-04-26 | 1 | -1/+22 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am ccec5f0d: resolved conflicts for merge of 02e85744 to master | Elliott Hughes | 2014-04-25 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am bf19fa4f: Merge "Move bouncer to the bottom, but only on phones." | Jorim Jaggi | 2014-04-17 | 3 | -3/+31 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am b91dfd95: Merge "Fix not being able to unlock SIM PIN." | Jorim Jaggi | 2014-04-17 | 4 | -24/+24 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | am e0fa592a: Merge "Show enter PIN/PUK before notifications on Keyguard." | Jorim Jaggi | 2014-04-16 | 3 | -15/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am 3d72c067: Merge "Remove activitystrings.xml from localized resource direct... | Baligh Uddin | 2014-04-16 | 45 | -1620/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 352e1082 to master-nova | Evan Charlton | 2014-04-14 | 54 | -2336/+272 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am bd924d2e: Merge "Revert "Mark the keyguard package as required for profile"" | Alexandra Gherghina | 2014-04-12 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am ae3f7cca: Merge "Add app_name to keyguard package." | John Spurlock | 2014-04-11 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b325345e: Merge "Switch framework Holo references to Quantum.Light" | Alan Viverette | 2014-04-02 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am df42723d: Merge "Don\'t double prompt on booting encrypted device" | Paul Lawrence | 2014-04-01 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a3dafcfb: Add a SampleTrustAgent | Adrian Roos | 2014-03-31 | 7 | -0/+323 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 46842d94: Make Keyguard trust aware | Adrian Roos | 2014-03-31 | 6 | -8/+40 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bd6738b2: Merge "Mark the keyguard package as required for profile" | Alexandra Gherghina | 2014-03-31 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6ee7d250: Revert "Don\'t prompt at boot if we already did that when decryp... | Paul Lawrence | 2014-03-26 | 1 | -7/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypt... | Paul Lawrence | 2014-03-21 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 5837a15d: am 1d6c2573: am aebe3b6c: am abde0aaa: am 375ff2c4: am 2598fbd7:... | Jim Miller | 2014-03-20 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am dbd60a71: am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Preve... | Chris Craik | 2014-03-19 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 75fc5928: Merge "Fix bug that allowed avoiding lockout if too many wrong p... | Adrian Roos | 2014-03-10 | 1 | -11/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6d22d75c: Keyguard Analytics: Remove unused constant. | Adrian Roos | 2014-03-03 | 1 | -2/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 58b58fe6: Add session analytics to Keyguard. | Adrian Roos | 2014-03-03 | 7 | -6/+775 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility and add bouncer event in KeyguardUpdateMonitor | Adrian Roos | 2014-05-14 | 2 | -2/+46 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Handle media key events correctly on Keyguard." | Jorim Jaggi | 2014-05-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle media key events correctly on Keyguard. | Jorim Jaggi | 2014-05-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't clear the pattern when window focus changes." | Jim Miller | 2014-05-14 | 1 | -9/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't clear the pattern when window focus changes. | Jim Miller | 2014-05-13 | 1 | -9/+0 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't clear the password field when window focus changes." | Jim Miller | 2014-05-13 | 1 | -7/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't clear the password field when window focus changes. | Jim Miller | 2014-05-12 | 1 | -7/+0 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-05-12 | 1 | -2/+2 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |