summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Expand)AuthorAgeFilesLines
* am 7c8363eb: am d80ff0a4: Merge "wifi: update text displayed during hotspot o...Irfan Sheriff2012-07-031-2/+2
|\
| * 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 d601be8f: am 313ab172: Fix issue #6761130: Clearing app data in settings d...Dianne Hackborn2012-06-292-11/+25
|\ \ \ \ | |/ / /
| * | | 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 1f1b9abd: am beb3d8b1: Merge "Fix Settings NPE" into jb-devBrian Muramatsu2012-06-281-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | am beb3d8b1: Merge "Fix Settings NPE" into jb-devBrian Muramatsu2012-06-281-1/+5
| |\ \ \ \ | | |/ / /
| | * | | Fix Settings NPEBrian Muramatsu2012-06-281-1/+5
* | | | | resolved conflicts for merge of 8f12b128 to masterJake Hamby2012-06-251-0/+21
|\ \ \ \ \ | |/ / / /
| * | | | 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 66b0ad57: am 9938ac8a: Merge "Fix incorrect updating of headers in Setting...Amith Yamasani2012-06-201-14/+8
|\ \ \ \ \ | |/ / / /
| * | | | 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 1b4a9b41: am 5739d4fe: Merge "Use string resources instead of literals for...Christopher Tate2012-06-191-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 f62df931: am 8e1981cc: Merge "Show full summary for network location serci...Amith Yamasani2012-06-191-5/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 2027328c: am 4d8dac07: Merge "Implement issue #6633077: Improve permission...Dianne Hackborn2012-06-181-2/+41
|\ \ \ \ \ | |/ / / /
| * | | | 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 fe5a72da: am ed99a81e: Merge "Fix issue #6664140: Time to lock should work...Dianne Hackborn2012-06-181-1/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | |/ / /
* | | | | Merge "Include WIFI scan time in per-application power usage summary."Nick Pelly2012-06-151-13/+29
|\ \ \ \ \
| * | | | | Include WIFI scan time in per-application power usage summary.Nick Pelly2012-06-151-13/+29
* | | | | | am e5147e49: am 5b7a8204: Merge "Show only the language if there\'s only one ...Amith Yamasani2012-06-141-4/+32
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | | | | | Fix 6654057: Fixing crash if device is rotated during confirm passwordDanielle Millett2012-06-141-1/+3
* | | | | | am c35b51f3: am cd4428ce: Storage banner when device in low disk state.Jeff Sharkey2012-06-121-0/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | UI to add a photo to a user's profile.Amith Yamasani2012-06-122-10/+110
* | | | | | am 99f27dc5: Merge "Swap start/stop of SettingsObserver and InputDeviceListen...Jean-Baptiste Queru2012-06-121-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Swap start/stop of SettingsObserver and InputDeviceListenerJean-Baptiste Queru2012-06-121-2/+2
* | | | | | am a6589134: Merge "resolved conflicts for merge of 051f46d7 to jb-dev-plus-a...Jean-Baptiste Queru2012-06-121-3/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 8b16c219: am 3f9ec9f1: Merge "Disable notification alerts in Settings for ...Russell Brenner2012-06-121-5/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| | |\ \ \ \ \