summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
* am eefa61ed: Merge "Settings: Use ICS alert drawable"Jean-Baptiste Queru2012-08-1312-19/+19
|\
| * Merge "Settings: Use ICS alert drawable"Jean-Baptiste Queru2012-08-1312-19/+19
| |\
| | * Settings: Use ICS alert drawableBjörn Lundén2012-05-3112-19/+19
* | | am 5d72b272: Merge "Add support for SE Android to the Settings app."Jean-Baptiste Queru2012-08-081-0/+15
|\ \ \ | |/ /
| * | Add support for SE Android to the Settings app.Stephen Smalley2012-07-201-0/+15
| * | Use telephony-common - DO NOT MERGEWink Saville2012-07-178-12/+17
* | | am ca511a81: Fix appwidget bind dialogMichael Jurka2012-08-021-2/+2
|\ \ \
| * | | Fix appwidget bind dialogMichael Jurka2012-08-021-2/+2
* | | | am 07841668: Merge "Move Google-apps specific location settings to a Google p...Amith Yamasani2012-07-262-162/+77
|\ \ \ \ | |/ / /
| * | | Move Google-apps specific location settings to a Google packageAmith Yamasani2012-07-262-162/+77
* | | | am ea819b07: Merge "Implement issue #6819955: Add button to take bug report."...Dianne Hackborn2012-07-131-0/+61
|\ \ \ \ | |/ / /
| * | | Implement issue #6819955: Add button to take bug report.Dianne Hackborn2012-07-131-0/+61
* | | | am b0b45c02: Display FCC id for LTE in Settings.John Wang2012-07-121-0/+8
|\ \ \ \ | |/ / /
| * | | Display FCC id for LTE in Settings.John Wang2012-07-111-0/+8
* | | | Use telephony-commonWink Saville2012-07-118-12/+17
| |/ / |/| |
* | | am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"Irfan Sheriff2012-07-031-2/+2
|\ \ \
| * \ \ Merge "wifi: update text displayed during hotspot on/off"Irfan Sheriff2012-07-031-2/+2
| |\ \ \
| | * | | wifi: update text displayed during hotspot on/offVishal Mahaveer2012-05-021-2/+2
* | | | | am 313ab172: Fix issue #6761130: Clearing app data in settings does not clear...Dianne Hackborn2012-06-292-11/+25
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix issue #6761130: Clearing app data in settings does not clear app's USB st...Dianne Hackborn2012-06-292-11/+25
* | | | | am beb3d8b1: Merge "Fix Settings NPE" into jb-devBrian Muramatsu2012-06-281-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Fix Settings NPEBrian Muramatsu2012-06-281-1/+5
* | | | | am f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast setting...Jake Hamby2012-06-251-0/+21
|\ \ \ \ \ | |/ / / /
| * | | | Add menu item to Settings to go to Cell Broadcast settings.Jake Hamby2012-06-251-0/+21
* | | | | am 9938ac8a: Merge "Fix incorrect updating of headers in Settings" into jb-devAmith Yamasani2012-06-201-14/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix incorrect updating of headers in Settings" into jb-devAmith Yamasani2012-06-201-14/+8
| |\ \ \ \
| | * | | | Fix incorrect updating of headers in SettingsAmith Yamasani2012-06-201-14/+8
* | | | | | am 5739d4fe: Merge "Use string resources instead of literals for backup passw...Christopher Tate2012-06-191-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Use string resources instead of literals for backup password confirmat...Christopher Tate2012-06-191-3/+3
| |\ \ \ \ \
| | * | | | | Use string resources instead of literals for backup password confirmationsChristopher Tate2012-06-191-3/+3
| | |/ / / /
* | | | | | am 8e1981cc: Merge "Show full summary for network location sercice even for w...Amith Yamasani2012-06-191-5/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Show full summary for network location sercice even for wifi-only devicesAmith Yamasani2012-06-191-5/+0
| |/ / / /
* | | | | am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for...Dianne Hackborn2012-06-181-2/+41
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Implement issue #6633077: Improve permissions display for..." into jb-devDianne Hackborn2012-06-151-2/+41
| |\ \ \ \
| | * | | | Implement issue #6633077: Improve permissions display for...Dianne Hackborn2012-06-151-2/+41
* | | | | | am ed99a81e: Merge "Fix issue #6664140: Time to lock should work even Stay aw...Dianne Hackborn2012-06-181-1/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix issue #6664140: Time to lock should work even Stay awake...Dianne Hackborn2012-06-151-1/+18
| |/ / / /
* | | | | am 5b7a8204: Merge "Show only the language if there\'s only one locale for th...Amith Yamasani2012-06-131-4/+32
|\ \ \ \ \ | |/ / / /
| * | | | Show only the language if there's only one locale for the language.Amith Yamasani2012-06-131-4/+32
* | | | | am cd4428ce: Storage banner when device in low disk state.Jeff Sharkey2012-06-121-0/+19
|\ \ \ \ \ | |/ / / /
| * | | | Storage banner when device in low disk state.Jeff Sharkey2012-06-121-0/+19
* | | | | Swap start/stop of SettingsObserver and InputDeviceListenerJean-Baptiste Queru2012-06-121-2/+2
* | | | | resolved conflicts for merge of 051f46d7 to jb-dev-plus-aospJean-Baptiste Queru2012-06-121-3/+15
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Unregister ContentObserver in InputMethodAndLanguageSettings class"Jean-Baptiste Queru2012-06-121-3/+15
| |\ \ \ \
| | * | | | Unregister ContentObserver in InputMethodAndLanguageSettings classShuhrat Dehkanov2012-06-131-3/+15
* | | | | | am 3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-devRussell Brenner2012-06-121-5/+7
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Disable notification alerts in Settings for SUW" into jb-devRussell Brenner2012-06-121-5/+7
| |\ \ \ \ \
| | * | | | | Disable notification alerts in Settings for SUWRussell Brenner2012-06-111-5/+7
* | | | | | | am b5858bbd: Fix NPE in rotation lock content observer.Jeff Brown2012-06-121-2/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix NPE in rotation lock content observer.Jeff Brown2012-06-121-2/+5