summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge "Worked around back button navigation issue"Lifu Tang2015-04-092-17/+25
|\
| * Worked around back button navigation issueLifu Tang2015-04-092-17/+25
* | Merge "Zen: Move zen mode preference to switch bar."John Spurlock2015-04-096-136/+202
|\ \
| * | Zen: Move zen mode preference to switch bar.John Spurlock2015-04-046-136/+202
* | | Merge "Enable BugreportStorageProvider when bug report is enabled"Ryo Hashimoto2015-04-091-0/+13
|\ \ \
| * | | Enable BugreportStorageProvider when bug report is enabledRyo Hashimoto2015-03-201-0/+13
* | | | Merge "Allow none lockscreen with multiple users"Adrian Roos2015-04-082-19/+3
|\ \ \ \
| * | | | Allow none lockscreen with multiple usersAdrian Roos2015-04-072-19/+3
* | | | | Merge "Hide emergency app settings on non-voice deivces"Adrian Roos2015-04-083-3/+40
|\ \ \ \ \
| * | | | | Hide emergency app settings on non-voice deivcesAdrian Roos2015-04-083-3/+40
| |/ / / /
* | | | | Merge "Settings - add support for Launch by Default - part 2"Fabrice Di Meglio2015-04-082-26/+51
|\ \ \ \ \
| * | | | | Settings - add support for Launch by Default - part 2Fabrice Di Meglio2015-04-072-26/+51
* | | | | | Merge "Update name of field used from BatterySipper"Adam Lesinski2015-04-072-24/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update name of field used from BatterySipperAdam Lesinski2015-04-072-24/+22
* | | | | | Merge "Add runtime permission summary for M apps"Jason Monk2015-04-072-0/+177
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add runtime permission summary for M appsJason Monk2015-04-072-0/+177
* | | | | | Merge "Fix crash on rotation while ICE dialog is open"Adrian Roos2015-04-071-2/+66
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix crash on rotation while ICE dialog is openAdrian Roos2015-04-071-2/+66
* | | | | | Merge "Revert "Update name of field used from BatterySipper""Bart Sears2015-04-072-22/+24
|\ \ \ \ \ \
| * | | | | | Revert "Update name of field used from BatterySipper"Bart Sears2015-04-072-22/+24
* | | | | | | Merge "Update name of field used from BatterySipper"Adam Lesinski2015-04-072-24/+22
|\| | | | | |
| * | | | | | Update name of field used from BatterySipperAdam Lesinski2015-04-062-24/+22
* | | | | | | Merge "Updated system settings to control BLE scanning"Lifu Tang2015-04-061-2/+11
|\ \ \ \ \ \ \
| * | | | | | | Updated system settings to control BLE scanningLifu Tang2015-04-061-2/+11
* | | | | | | | Merge "Added links to scanning settings"Lifu Tang2015-04-063-17/+155
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Added links to scanning settingsLifu Tang2015-04-063-17/+155
| |/ / / / / /
* | | | | | | Merge "Update with new assist app ops."Dianne Hackborn2015-04-061-2/+6
|\ \ \ \ \ \ \
| * | | | | | | Update with new assist app ops.Dianne Hackborn2015-04-041-2/+6
* | | | | | | | [Fingerprint] Add fingerprint text in setup flowMaurice Lam2015-04-061-0/+8
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge "Settings: Move downtime to new automation sub-settings page."John Spurlock2015-04-036-364/+477
|\ \ \ \ \ \ \
| * | | | | | | Settings: Move downtime to new automation sub-settings page.John Spurlock2015-04-036-364/+477
* | | | | | | | Merge "Support for nested bundles in setApplicationRestrictions"Fyodor Kupolov2015-04-032-17/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Support for nested bundles in setApplicationRestrictionsFyodor Kupolov2015-04-032-17/+4
* | | | | | | | Merge "Settings - add support for Launch by Default"Fabrice Di Meglio2015-04-0310-163/+487
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Settings - add support for Launch by DefaultFabrice Di Meglio2015-04-0310-163/+487
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Make Settings app not use cleartext network traffic."Alex Klyubin2015-04-032-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Make Settings app not use cleartext network traffic.Alex Klyubin2015-04-022-2/+2
| |/ / / / /
* | | | | | Merge "Settings: Move priority configuration to its own sub-settings page."John Spurlock2015-04-036-187/+329
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Settings: Move priority configuration to its own sub-settings page.John Spurlock2015-04-036-187/+329
* | | | | | Merge "Show current screen lock as summary"Jason Monk2015-04-031-0/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Show current screen lock as summaryJason Monk2015-03-301-0/+28
* | | | | | Settings: Support new alarms-only zen value.John Spurlock2015-04-021-1/+3
| |/ / / / |/| | | |
* | | | | Merge "Add default emergency app setting"Adrian Roos2015-04-021-0/+137
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add default emergency app settingAdrian Roos2015-04-021-0/+137
* | | | | Merge "provide better instructions for adding settings views."Chris Wren2015-04-023-0/+24
|\ \ \ \ \
| * | | | | provide better instructions for adding settings views.Chris Wren2015-04-023-0/+24
* | | | | | Merge "Prepare to make Fingerprint API public."Jim Miller2015-04-024-12/+12
|\ \ \ \ \ \
| * | | | | | Prepare to make Fingerprint API public.Jim Miller2015-04-014-12/+12
| | |/ / / / | |/| | | |
* | | | | | Merge changes from topic 'mwd-merge-040115'Etan Cohen2015-04-022-6/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge commit '2241607' into mergeEtan Cohen2015-03-311-5/+19
| |\ \ \ \ \