summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge "Fix fingerprint settings ripples" into mnc-dr-devJorim Jaggi2015-09-031-1/+2
|\ \ \ \
| * | | | Fix fingerprint settings ripplesJorim Jaggi2015-09-021-1/+2
| | |/ / | |/| |
* | | | Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-devMaurice Lam2015-09-021-2/+2
|\ \ \ \
| * | | | [Fingerprint] Update strings for skip dialogMaurice Lam2015-09-021-2/+2
* | | | | To hide none security option, use config_hide_none_security_option configSungmin Choi2015-09-021-0/+4
|/ / / /
* | | | Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-devXiyuan Xia2015-09-013-66/+179
|\ \ \ \
| * | | | Fix races in ConfirmPassword/PatternXiyuan Xia2015-08-313-66/+179
* | | | | Merge "Protect against multiple provision responses" into mnc-dr-devJason Monk2015-09-011-2/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Protect against multiple provision responsesJason Monk2015-09-011-2/+6
| | |/ / | |/| |
* | | | Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-devXiyuan Xia2015-09-011-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix wrong stage exception in ChooseLockPatternXiyuan Xia2015-09-011-2/+2
| |/ /
* | | Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-devMaurice Lam2015-08-281-2/+53
|\ \ \ | |/ / |/| |
| * | [Fingerprint] Add skip dialog during SUWMaurice Lam2015-08-281-2/+53
* | | Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-devXiyuan Xia2015-08-283-172/+292
|\ \ \ | |/ / |/| |
| * | Fix ChoosePat/Pin/Pwd crash from async taskXiyuan Xia2015-08-273-172/+292
* | | Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr...Jim Miller2015-08-251-1/+2
|\ \ \ | |/ / |/| |
| * | Don't attempt to remove fp templates if none are enrolledJim Miller2015-08-211-1/+2
* | | am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" inste...Sanket Padawe2015-08-241-1/+3
|\ \ \ | |/ / |/| |
| * | Merge "Avoid new network to connect by using "Add Network" instead only Save ...Sanket Padawe2015-08-241-1/+3
| |\ \
| | * | Avoid new network to connect by using "Add Network" instead only Save it.Sanket Padawe2015-08-211-1/+3
* | | | am ffe701dc: Present the security patch date in a human-friendly formatChristopher Tate2015-08-211-0/+14
|\ \ \ \ | |/ / /
| * | | Present the security patch date in a human-friendly formatChristopher Tate2015-08-201-0/+14
| |/ /
* | | Stop crash on repeated enters on virtual keyboardPaul Lawrence2015-08-181-0/+7
| |/ |/|
* | am 0ece6a32: String update for battery details page.Julia Reynolds2015-08-171-1/+1
|\ \ | |/
| * String update for battery details page.Julia Reynolds2015-08-171-1/+1
* | Merge "instrument fingerprint settings" into mnc-dr-devChris Wren2015-08-1714-3/+129
|\ \
| * | instrument fingerprint settingsChris Wren2015-08-1414-3/+129
* | | Merge "Fix Usb-C dialog issues" into mnc-dr-devJason Monk2015-08-171-1/+1
|\ \ \
| * | | Fix Usb-C dialog issuesJason Monk2015-08-121-1/+1
* | | | am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and syste...Adam Lesinski2015-08-142-86/+132
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into ...Adam Lesinski2015-08-142-86/+132
| |\ \ \
| | * | | BatteryStats: Fix coalescing of shared app GIDs and system UIDsAdam Lesinski2015-08-132-86/+132
* | | | | am b4158f0e: Merge "Only offer migration between private volumes." into mnc-devJeff Sharkey2015-08-141-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Only offer migration between private volumes." into mnc-devJeff Sharkey2015-08-141-1/+3
| |\ \ \ \
| | * | | | Only offer migration between private volumes.Jeff Sharkey2015-08-141-1/+3
* | | | | | am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-devChris Tate2015-08-141-2/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge "Make "Ask every time" actually work that way" into mnc-devChris Tate2015-08-141-2/+3
| |\ \ \ \
| | * | | | Make "Ask every time" actually work that wayChristopher Tate2015-08-131-2/+3
* | | | | | am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-devJeff Sharkey2015-08-141-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Show storage slow dialog allowing state loss." into mnc-devJeff Sharkey2015-08-141-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | |
| | * | | Show storage slow dialog allowing state loss.Jeff Sharkey2015-08-131-1/+1
| | |/ /
* | | | Merge "Wait with finishing until fingerprints are removed" into mnc-dr-devJorim Jaggi2015-08-132-7/+17
|\ \ \ \
| * | | | Wait with finishing until fingerprints are removedJorim Jaggi2015-08-122-7/+17
* | | | | am f67d0785: Merge "Fix issue #23116383: Include security patch level in Sett...Dianne Hackborn2015-08-131-0/+8
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge "Fix issue #23116383: Include security patch level in Settings" into mn...Dianne Hackborn2015-08-131-0/+8
| |\ \ \ | | |/ / | |/| |
| | * | Fix issue #23116383: Include security patch level in SettingsDianne Hackborn2015-08-121-0/+8
* | | | Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-devSanket Padawe2015-08-121-3/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | Avoid sending identity along with EAP sim, aka & aka'.Sanket Padawe2015-08-111-3/+11
* | | | am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" in...Andres Morales2015-08-111-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | [ConfirmPattern] use correct user id for stealth modeAndres Morales2015-08-111-1/+1
| | |/ | |/|
generated by cgit v1.1 at 2024-07-06 15:40:42 +0000