summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
Commit message (Expand)AuthorAgeFilesLines
* am 199d621c: am f1b05619: am 95e89cae: Fix jank when pin/pattern is shownJorim Jaggi2014-11-262-4/+9
|\
| * am f1b05619: am 95e89cae: Fix jank when pin/pattern is shownJorim Jaggi2014-11-262-4/+9
| |\
| | * am 95e89cae: Fix jank when pin/pattern is shownJorim Jaggi2014-11-262-4/+9
| | |\
| | | * Fix jank when pin/pattern is shownJorim Jaggi2014-11-262-4/+9
* | | | am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to ...Jorim Jaggi2014-11-261-0/+6
|\ \ \ \ | |/ / /
| * | | am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-de...Jorim Jaggi2014-11-261-0/+6
| |\ \ \ | | |/ /
| | * | Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-m...Jorim Jaggi2014-11-261-0/+6
| | |\ \ | | | |/
| | | * Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-devJorim Jaggi2014-11-261-0/+6
| | | |\
| | | | * Make IKeyguardService interface asynchronousJim Miller2014-11-251-0/+6
| | * | | Import translations. DO NOT MERGEGeoff Mendal2014-11-2621-588/+294
| | |/ /
* | | | am ed79856d: am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from curren...Alan Viverette2014-11-261-2/+3
|\ \ \ \ | |/ / /
| * | | am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active us...Alan Viverette2014-11-261-2/+3
| |\ \ \ | | |/ /
| | * | Load SPEAK_PASSWORD from currently active user rather than selfAlan Viverette2014-11-251-2/+3
| | |/
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-2621-588/+294
* | | am 649c0ca2: am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK scre...Jorim Jaggi2014-11-254-0/+22
|\ \ \ | |/ /
| * | am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-...Jorim Jaggi2014-11-254-0/+22
| |\ \ | | |/
| | * Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-devJorim Jaggi2014-11-244-0/+22
| | |\
| | | * Tint SIM images in PIN/PUK screenJorim Jaggi2014-11-204-0/+22
| | * | Import translations. DO NOT MERGEGeoff Mendal2014-11-2472-517/+2203
* | | | am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aospJorim Jaggi2014-11-251-1/+6
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aospJorim Jaggi2014-11-251-1/+6
| |\ \ \ | | |/ /
| | * | Merge "Fixed several time related states for secondary users" into lmp-mr1-devSelim Cinek2014-11-241-1/+6
| | |\ \
| | | * | Fixed several time related states for secondary usersSelim Cinek2014-11-211-1/+6
* | | | | am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to Subscript...Wink Saville2014-11-244-21/+33
|\ \ \ \ \ | |/ / / /
| * | | | am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager AP...Wink Saville2014-11-244-21/+33
| |\ \ \ \ | | |/ / /
| | * | | Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-224-21/+33
* | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-2472-288/+1974
* | | | | am 1f26bf6b: am 108bdbc9: am efb2df69: Merge "Different messages when wiping ...Amith Yamasani2014-11-222-24/+113
|\ \ \ \ \ | |/ / / /
| * | | | am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not ...Amith Yamasani2014-11-212-24/+113
| |\ \ \ \ | | |/ / /
| | * | | Merge "Different messages when wiping user and not device" into lmp-mr1-devAmith Yamasani2014-11-212-24/+113
| | |\ \ \
| | | * | | Different messages when wiping user and not deviceAmith Yamasani2014-11-212-24/+113
* | | | | | am 879a4ee8: Merge "Add multi-sim support to keyguard" into lmp-mr1-dev autom...Jim Miller2014-11-219-82/+319
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5eJim Miller2014-11-219-82/+319
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Add multi-sim support to keyguard" into lmp-mr1-devJim Miller2014-11-219-82/+319
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | Add multi-sim support to keyguardJim Miller2014-11-209-82/+319
| | | |/
* | | | am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService"...Adrian Roos2014-11-213-5/+49
|\ \ \ \ | |/ / /
| * | | am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1...Adrian Roos2014-11-213-5/+49
| |\ \ \ | | |/ /
| | * | Add device locked API for TrustAgentServiceAdrian Roos2014-11-203-5/+49
* | | | am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" i...Adrian Roos2014-11-212-9/+9
|\ \ \ \ | |/ / /
| * | | am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-devAdrian Roos2014-11-212-9/+9
| |\ \ \ | | |/ /
| | * | Update KeyguardManager.isDeviceLocked APIAdrian Roos2014-11-202-9/+9
| | |/
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-192-2/+2
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-173-12/+12
* | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-11-132-11/+11
|\ \ \
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-11-122-11/+11
* | | | am 858fb04f: am 5b560f57: am 29685c2f: Merge "Added dissapear animation to pa...Selim Cinek2014-11-1211-69/+197
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 5b560f57: am 29685c2f: Merge "Added dissapear animation to pattern and pin...Selim Cinek2014-11-1211-69/+197
| |\ \ | | |/
| | * Merge "Added dissapear animation to pattern and pin input" into lmp-mr1-devSelim Cinek2014-11-1211-69/+197
| | |\
| | | * Added dissapear animation to pattern and pin inputSelim Cinek2014-11-1211-69/+197
* | | | am 4974fae3: am 5a8f191c: am 3e54ce27: Merge "Adjust owner info to spec" into...Jorim Jaggi2014-11-103-3/+3
|\ \ \ \ | |/ / /