summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 841ce670: Merge commit \'81af21e67cd842d16d4b45e8a2d1ec56ff8d764f\' into j...Baligh Uddin2012-11-0242-758/+1477
|\
| * Merge commit '81af21e67cd842d16d4b45e8a2d1ec56ff8d764f' into jb-mr1-devBaligh Uddin2012-11-0242-758/+1477
| |\
| | * Merge "hide the correct text, and more text, on bounce" into jb-mr1-lockscree...Chris Wren2012-11-022-7/+42
| | |\
| | | * hide the correct text, and more text, on bounceChris Wren2012-11-022-7/+42
| | * | Merge "Improve PIN key layouts." into jb-mr1-lockscreen-devDaniel Sandler2012-11-025-4/+10
| | |\ \
| | | * | Improve PIN key layouts.Daniel Sandler2012-11-025-4/+10
| | * | | Merge "Obscure speech for PIN password keys when no headset plugged in." into...Svetoslav Ganov2012-11-024-44/+182
| | |\ \ \
| | | * | | Obscure speech for PIN password keys when no headset plugged in.alanv2012-11-024-44/+182
| | * | | | am 28e8f76c: Merge "Cannot click on partially visible views in touch explorat...Svetoslav Ganov2012-11-022-0/+22
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Initial changes to allow dropping on delete target to remove widget.Winson Chung2012-11-0214-80/+337
| | * | | | Merge "hide multiuser selector when IME is up." into jb-mr1-lockscreen-devChris Wren2012-11-024-22/+42
| | |\ \ \ \
| | | * | | | hide multiuser selector when IME is up.Chris Wren2012-11-024-22/+42
| | * | | | | am 37238e5a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-11-020-0/+0
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Block swipe up gesture if challenge non-interactive.John Spurlock2012-11-021-4/+7
| | * | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-devBaligh Uddin2012-11-023-4/+4
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-023-4/+4
| | * | | | | | Properly disable challenge handle.John Spurlock2012-11-021-8/+8
| | * | | | | | Disable disable back if using an alternate back icon.John Spurlock2012-11-021-1/+4
| | | |_|/ / / | | |/| | | |
| | * | | | | Disable security handle when swiping into camera widget.John Spurlock2012-11-027-47/+76
| | * | | | | Merge "Fix small issue with previous CL" into jb-mr1-lockscreen-devAdam Cohen2012-11-021-1/+3
| | |\ \ \ \ \
| | | * | | | | Fix small issue with previous CLAdam Cohen2012-11-021-1/+3
| | * | | | | | Merge "Widget size policy, size callbacks" into jb-mr1-lockscreen-devAdam Cohen2012-11-014-45/+112
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Widget size policy, size callbacksAdam Cohen2012-11-014-45/+112
| | * | | | | | am 98b930ce: Cleaning up keyguard persistence threads when the pager is detac...Winson Chung2012-11-010-0/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "Only suppressing FUL on boot if selected fixes b/7338965" into jb-mr1-...Brian Colonna2012-11-011-2/+16
| | |\ \ \ \ \ \ \
| | | * | | | | | | Only suppressing FUL on boot if selected fixes b/7338965Brian Colonna2012-11-011-2/+16
| | * | | | | | | | Don't show security method until we actually return from the cameraJim Miller2012-11-011-6/+12
| | * | | | | | | | Merge "PUK support." into jb-mr1-lockscreen-devDaniel Sandler2012-11-013-205/+245
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | PUK support.Daniel Sandler2012-11-023-205/+245
| | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Fix whitespace problem and sync with prototype.Jim Miller2012-11-011-6/+5
| | |/ / / / / / /
| | * | | | | | | Fix build.Daniel Sandler2012-11-011-1/+9
| | * | | | | | | Merge "SIM PIN support." into jb-mr1-lockscreen-devDaniel Sandler2012-11-012-200/+242
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | SIM PIN support.Daniel Sandler2012-11-012-200/+242
| | * | | | | | | Merge "Use clock's widget as the default keyguard widget" into jb-mr1-lockscr...Michael Jurka2012-11-017-76/+90
| | |\ \ \ \ \ \ \
| | | * | | | | | | Use clock's widget as the default keyguard widgetMichael Jurka2012-11-017-76/+90
| | * | | | | | | | Merge "Add configurable em-dash separator for all concatenated keyguard strin...Jim Miller2012-11-014-13/+23
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Add configurable em-dash separator for all concatenated keyguard stringsJim Miller2012-11-014-13/+23
| | * | | | | | | | | Merge "Cleaning up keyguard persistence threads when the pager is detached. (...Winson Chung2012-11-011-0/+10
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Cleaning up keyguard persistence threads when the pager is detached. (Bug 746...Winson Chung2012-11-011-0/+10
| | * | | | | | | | | | am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into j...Ed Heyl2012-11-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge changes Ib3133583,I0262172d into jb-mr1-lockscreen-devDaniel Sandler2012-11-014-7/+28
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Show "wrong password" on password screen, not "wrong PIN"Daniel Sandler2012-11-013-1/+12
| | | * | | | | | | | | | Restore incorrect-PIN lockouts.Daniel Sandler2012-11-013-6/+16
| | * | | | | | | | | | | am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChanne...Jeff Brown2012-11-012-6/+16
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 30fd78e2: am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stat...Scott Main2012-11-011-11/+11
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 7ab7f538: Hide new location APIs and undeprecate old onesLaurent Tu2012-11-0111-306/+241
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 465c3753: Merge "docs: misc changes for new manifest attributes, including...Scott Main2012-11-014-10/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am b9372de0: Merge "More debugging for issue #7343200 Fails to show wallpaper...Dianne Hackborn2012-11-015-51/+207
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Revert "Pushing state persistence to a background thread"" into jb-mr1...Adam Cohen2012-11-011-35/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Revert "Pushing state persistence to a background thread"Adam Cohen2012-11-011-35/+12