summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/Settings.java
Commit message (Expand)AuthorAgeFilesLines
* Lockscreen settings per userAmith Yamasani2012-04-051-0/+28
* resolved conflicts for merge of bff6a514 to masterJustin Koh2012-04-041-6/+15
|\
| * Persists the master mute volume setting.Justin Koh2012-04-031-6/+15
| * am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-051-2/+2
| |\
| * \ am 52bfc243: docs: fix misc doc bugs from external issue trackerScott Main2012-02-091-1/+1
| |\ \
| * \ \ am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1Wink Saville2012-01-041-3/+12
| |\ \ \
| * \ \ \ am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1Irfan Sheriff2011-12-071-0/+8
| |\ \ \ \
| * \ \ \ \ resolved conflicts for merge of ea25ea7e to ics-aahJason Simmons2011-12-071-0/+6
| |\ \ \ \ \
| * \ \ \ \ \ am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE...Daniel Sandler2011-12-011-22/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1Daniel Sandler2011-11-191-8/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of faa81c82 to ics-aahJason Simmons2011-11-101-9/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 604019c8: Merge "Fix build." into ics-mr1Robert Greenwalt2011-11-081-0/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am ea54b760: Merge "Wimax : wimax framework related open source." into ics-mr1Robert Greenwalt2011-11-081-0/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 1366c756 to ics-aahJason Simmons2011-11-081-1/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 8b771243: am 3d708451: Merge "Separate data stall detection and recovery f...Wink Saville2011-11-041-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Save and restore master volume in the settings providerMike Lockwood2011-10-281-0/+6
| * | | | | | | | | | | | | SettingsProvider: Add support for overriding lockscreen.disabled default valueMike Lockwood2011-10-281-0/+6
* | | | | | | | | | | | | | Added a setting for whether biometric weak liveliness is enabled.Danielle Millett2012-03-221-0/+8
* | | | | | | | | | | | | | Merge "Enhancements for avoiding poor connection on wifi"Irfan Sheriff2012-03-091-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Enhancements for avoiding poor connection on wifiIrfan Sheriff2012-03-081-0/+8
* | | | | | | | | | | | | | | resolved conflicts for merge of 532679a5 to masterDirk Dougherty2012-03-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Doc change: String changes for Android MarketDirk Dougherty2012-03-051-2/+2
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Improve Wi-Fi hand-offIrfan Sheriff2012-02-291-43/+12
* | | | | | | | | | | | | SettingsProvider: Add support for overriding lockscreen.disabled default valueMike Lockwood2012-02-101-0/+6
* | | | | | | | | | | | | Save and restore master volume in the settings providerMike Lockwood2012-02-101-0/+6
* | | | | | | | | | | | | am ec12ae99: am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external ...Scott Main2012-02-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | docs: fix misc doc bugs from external issue trackerScott Main2012-02-091-1/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | New global setting for developer options.Dianne Hackborn2012-02-021-0/+5
* | | | | | | | | | | | Add Developer Option setting for Animator scaling.Chet Haase2012-02-021-0/+7
* | | | | | | | | | | | Merge "Implement a cancelation mechanism for queries."Jeff Brown2012-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implement a cancelation mechanism for queries.Jeff Brown2012-01-271-1/+1
* | | | | | | | | | | | | Merge "Move network stats to FileRotator pattern."Jeff Sharkey2012-01-241-5/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Move network stats to FileRotator pattern.Jeff Sharkey2012-01-241-5/+26
* | | | | | | | | | | | | New brightness setting to adjust auto-brightness mode.Dianne Hackborn2012-01-231-0/+7
|/ / / / / / / / / / / /
* | | | | | | | | | | | am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall polling logic"...Wink Saville2012-01-041-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Enhancement on ICS data stall polling logicKazuhiro Ondo2012-01-041-3/+12
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Make the URL for the JavaScript based screen-reader used by WebView configura...Svetoslav Ganov2011-12-071-2/+18
* | | | | | | | | | | am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ...Irfan Sheriff2011-12-061-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Disable poor network connection aloneIrfan Sheriff2011-12-061-0/+8
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | am 1113e755: am ea25ea7e: Merge "Adding a system preference whether to speak ...Svetoslav Ganov2011-12-061-0/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Adding a system preference whether to speak passwords in accessibility mode.Svetoslav Ganov2011-12-051-0/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Put screensavers back in the icebox for now. DO NOT MERGE.Daniel Sandler2011-11-301-22/+0
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | am 25a43ada: am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into...Daniel Sandler2011-11-191-8/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Dreams (now Screen Candy) development.Daniel Sandler2011-11-181-8/+13
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for controlli...Tom Taylor2011-11-101-9/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Revert "Add new secure setting for controlling Messaging notifications"Tom Taylor2011-11-101-9/+1
| | |_|_|_|/ | |/| | | |
* | | | | | am 604019c8: Merge "Fix build." into ics-mr1Robert Greenwalt2011-11-091-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix build." into ics-mr1Robert Greenwalt2011-11-081-0/+6
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix build.Robert Greenwalt2011-11-081-0/+6
* | | | | | resolved conflicts for merge of ea54b760 to masterRobert Greenwalt2011-11-091-0/+3
|\ \ \ \ \ \ | |/ / / / /