Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Allow none lockscreen with multiple users | Adrian Roos | 2015-04-07 | 2 | -19/+3 | |
* | | | | | | | | | Merge "Hide emergency app settings on non-voice deivces" | Adrian Roos | 2015-04-08 | 3 | -3/+40 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Hide emergency app settings on non-voice deivces | Adrian Roos | 2015-04-08 | 3 | -3/+40 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge "Settings - add support for Launch by Default - part 2" | Fabrice Di Meglio | 2015-04-08 | 2 | -26/+51 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Settings - add support for Launch by Default - part 2 | Fabrice Di Meglio | 2015-04-07 | 2 | -26/+51 | |
* | | | | | | | | | | Merge "Update name of field used from BatterySipper" | Adam Lesinski | 2015-04-07 | 2 | -24/+22 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Update name of field used from BatterySipper | Adam Lesinski | 2015-04-07 | 2 | -24/+22 | |
* | | | | | | | | | | Merge "Add runtime permission summary for M apps" | Jason Monk | 2015-04-07 | 2 | -0/+177 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add runtime permission summary for M apps | Jason Monk | 2015-04-07 | 2 | -0/+177 | |
* | | | | | | | | | | Merge "Fix crash on rotation while ICE dialog is open" | Adrian Roos | 2015-04-07 | 1 | -2/+66 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Fix crash on rotation while ICE dialog is open | Adrian Roos | 2015-04-07 | 1 | -2/+66 | |
* | | | | | | | | | | Merge "Revert "Update name of field used from BatterySipper"" | Bart Sears | 2015-04-07 | 2 | -22/+24 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Revert "Update name of field used from BatterySipper" | Bart Sears | 2015-04-07 | 2 | -22/+24 | |
* | | | | | | | | | | | Merge "Update name of field used from BatterySipper" | Adam Lesinski | 2015-04-07 | 2 | -24/+22 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Update name of field used from BatterySipper | Adam Lesinski | 2015-04-06 | 2 | -24/+22 | |
* | | | | | | | | | | | Merge "Updated system settings to control BLE scanning" | Lifu Tang | 2015-04-06 | 1 | -2/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Updated system settings to control BLE scanning | Lifu Tang | 2015-04-06 | 1 | -2/+11 | |
* | | | | | | | | | | | | Merge "Added links to scanning settings" | Lifu Tang | 2015-04-06 | 3 | -17/+155 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Added links to scanning settings | Lifu Tang | 2015-04-06 | 3 | -17/+155 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge "Update with new assist app ops." | Dianne Hackborn | 2015-04-06 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Update with new assist app ops. | Dianne Hackborn | 2015-04-04 | 1 | -2/+6 | |
* | | | | | | | | | | | [Fingerprint] Add fingerprint text in setup flow | Maurice Lam | 2015-04-06 | 1 | -0/+8 | |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge "Settings: Move downtime to new automation sub-settings page." | John Spurlock | 2015-04-03 | 6 | -364/+477 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Settings: Move downtime to new automation sub-settings page. | John Spurlock | 2015-04-03 | 6 | -364/+477 | |
* | | | | | | | | | | | Merge "Support for nested bundles in setApplicationRestrictions" | Fyodor Kupolov | 2015-04-03 | 2 | -17/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Support for nested bundles in setApplicationRestrictions | Fyodor Kupolov | 2015-04-03 | 2 | -17/+4 | |
* | | | | | | | | | | | Merge "Settings - add support for Launch by Default" | Fabrice Di Meglio | 2015-04-03 | 10 | -163/+487 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Settings - add support for Launch by Default | Fabrice Di Meglio | 2015-04-03 | 10 | -163/+487 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge "Make Settings app not use cleartext network traffic." | Alex Klyubin | 2015-04-03 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Make Settings app not use cleartext network traffic. | Alex Klyubin | 2015-04-02 | 2 | -2/+2 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge "Settings: Move priority configuration to its own sub-settings page." | John Spurlock | 2015-04-03 | 6 | -187/+329 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Settings: Move priority configuration to its own sub-settings page. | John Spurlock | 2015-04-03 | 6 | -187/+329 | |
* | | | | | | | | | Merge "Show current screen lock as summary" | Jason Monk | 2015-04-03 | 1 | -0/+28 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Show current screen lock as summary | Jason Monk | 2015-03-30 | 1 | -0/+28 | |
* | | | | | | | | | Settings: Support new alarms-only zen value. | John Spurlock | 2015-04-02 | 1 | -1/+3 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge "Add default emergency app setting" | Adrian Roos | 2015-04-02 | 1 | -0/+137 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Add default emergency app setting | Adrian Roos | 2015-04-02 | 1 | -0/+137 | |
* | | | | | | | | Merge "provide better instructions for adding settings views." | Chris Wren | 2015-04-02 | 3 | -0/+24 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | provide better instructions for adding settings views. | Chris Wren | 2015-04-02 | 3 | -0/+24 | |
* | | | | | | | | | Merge "Prepare to make Fingerprint API public." | Jim Miller | 2015-04-02 | 4 | -12/+12 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Prepare to make Fingerprint API public. | Jim Miller | 2015-04-01 | 4 | -12/+12 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge changes from topic 'mwd-merge-040115' | Etan Cohen | 2015-04-02 | 2 | -6/+20 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge commit '2241607' into merge | Etan Cohen | 2015-03-31 | 1 | -5/+19 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | ||||||
| | * | | | | | | | Update Wi-Fi Calling settings | Pavel Zhamaitsiak | 2015-03-23 | 1 | -5/+19 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | ||||||
| | | * | | | | | | Update Wi-Fi Calling settings | Pavel Zhamaitsiak | 2015-03-23 | 1 | -5/+19 | |
| * | | | | | | | | Merge commit 'fe47522' into merge | Etan Cohen | 2015-03-31 | 1 | -1/+1 | |
| |\| | | | | | | | | |_|_|/ / / / | |/| | | | | | | ||||||
| | * | | | | | | Fix "Rename device" BT settings to avoid accepting blank spaces. | Sanket Padawe | 2015-03-23 | 1 | -1/+1 | |
* | | | | | | | | Move reset network settings into framework. | Stuart Scott | 2015-03-30 | 1 | -92/+17 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Merge "Add permissions screen to advanced apps" | Jason Monk | 2015-03-30 | 3 | -1/+322 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add permissions screen to advanced apps | Jason Monk | 2015-03-30 | 3 | -1/+322 | |
| |/ / / / / / |