summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | Support some changes to SettingsLibJason Monk2015-02-244-65/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Implement additional fingerprint flows in Settings."Jim Miller2015-03-1232-161/+514
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Implement additional fingerprint flows in Settings.Jim Miller2015-03-1132-161/+514
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "[WifiSettings] Refactor Wi-Fi required info"Maurice Lam2015-03-116-37/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | [WifiSettings] Refactor Wi-Fi required infoMaurice Lam2015-03-116-37/+30
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't reset the keystore during password change"Robin Lee2015-03-111-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't reset the keystore during password changeRobin Lee2015-03-061-1/+0
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-1111-27/+27
| |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | am a3d28d9c: (-s ours) am fd8f5459: (-s ours) am 0d8c3df4: (-s ours) Import t...Geoff Mendal2015-03-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am fd8f5459: (-s ours) am 0d8c3df4: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 0d8c3df4: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-097-30/+30
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 782d81bc: (-s ours) am f91c51b1: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am f91c51b1: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-097-30/+30
* | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0973-2896/+1805
| |_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Ensure redaction settings are visible on narrow screensAdrian Roos2015-03-053-5/+28
| |_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-0472-2870/+3880
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0472-2870/+3880
* | | | | | | | | | | | | | | | | | | | | | | | | | am a6315bde: (-s ours) am a07520f6: (-s ours) am ba5c9ed1: (-s ours) Import t...Geoff Mendal2015-03-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am a07520f6: (-s ours) am ba5c9ed1: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am ba5c9ed1: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-046-8/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | am d1c5ae48: (-s ours) am b4ee938f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | am b4ee938f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-046-8/+6
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Added Developer Options settings for multi-window mode."Wale Ogunwale2015-03-033-8/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Added Developer Options settings for multi-window mode.Wale Ogunwale2015-03-033-8/+74
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Prompt for lock pin on VPN screen when credential restriction is enabl...Julia Reynolds2015-03-031-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Prompt for lock pin on VPN screen when credential restriction is enabled.Julia Reynolds2015-03-031-1/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Split app info into several screens"Jason Monk2015-03-0316-1490/+2063
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Split app info into several screensJason Monk2015-03-0216-1490/+2063
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Add comment for night mode search keyword translationsAlan Viverette2015-03-021-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Settings app should be available to restricted user"Fyodor Kupolov2015-03-021-10/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Settings app should be available to restricted userFyodor Kupolov2015-03-021-10/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-0273-171/+3756
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0273-171/+3756
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | am bd74dff8: (-s ours) am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import t...Geoff Mendal2015-03-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 130fc5ca: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0272-130/+132
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 2e4703f4: (-s ours) am 5c66aacd: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am 5c66aacd: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0272-130/+132
* | | | | | | | | | | | | | | | | | | | | | | | | | Add fingerprint settings.Jim Miller2015-02-2726-23/+924
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug #19313587 Settings unusable when userdata is full"Fabrice Di Meglio2015-02-273-3/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #19313587 Settings unusable when userdata is fullFabrice Di Meglio2015-02-273-3/+35
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add support for user-selectable dark/light theme"Alan Viverette2015-02-2711-42/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add support for user-selectable dark/light themeAlan Viverette2015-02-2711-42/+78
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Badge Wi-Fi installer apps"Robin Lee2015-02-271-7/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |