summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | am 450c4c86: Merge "Exit to Settings when removing the only account for a typ...Amith Yamasani2012-06-083-4/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Exit to Settings when removing the only account for a type." into jb-devAmith Yamasani2012-06-083-4/+8
| |\ \ \ \
| | * | | | Exit to Settings when removing the only account for a type.Amith Yamasani2012-06-083-4/+8
* | | | | | am acd37771: Merge "Removing head turn and putting blink back" into jb-devDanielle Millett2012-06-082-141/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Removing head turn and putting blink back" into jb-devDanielle Millett2012-06-082-141/+31
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Removing head turn and putting blink backDanielle Millett2012-06-082-141/+31
* | | | | | am 5a0b3230: Merge "Add account type check for invisible sync adapters."Jean-Baptiste Queru2012-06-081-4/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Add account type check for invisible sync adapters.Zhenguo Fu2012-06-071-4/+7
* | | | | | am b3a049f5: Merge "Save the auto-sync dialog state for orientation changes" ...Amith Yamasani2012-06-081-0/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Save the auto-sync dialog state for orientation changes" into jb-devAmith Yamasani2012-06-081-0/+10
| |\ \ \ \ \
| | * | | | | Save the auto-sync dialog state for orientation changesAmith Yamasani2012-06-071-0/+10
* | | | | | | am cc993689: Merge "Directly go to account sync screen if there\'s only one a...Amith Yamasani2012-06-072-12/+37
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Directly go to account sync screen if there's only one account for that type.Amith Yamasani2012-06-072-12/+37
| |/ / / / /
* | | | | | am ffa6f6e3: Merge "Add back a SYNC_SETTINGS screen" into jb-devAmith Yamasani2012-06-075-21/+254
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add back a SYNC_SETTINGS screenAmith Yamasani2012-06-065-21/+254
| | |/ / / | |/| | |
* | | | | am 6a5e0252: Merge "Implement new rotation policy." into jb-devJeff Brown2012-06-052-64/+35
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Implement new rotation policy." into jb-devJeff Brown2012-06-052-64/+35
| |\ \ \ \
| | * | | | Implement new rotation policy.Jeff Brown2012-06-052-64/+35
* | | | | | am de4f8181: Merge "Revert "Settings: "Rotation lock" retains existing orient...Jeff Brown2012-06-051-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into...Jeff Brown2012-06-051-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Revert "Settings: "Rotation lock" retains existing orientation."Jeff Brown2012-06-051-1/+2
* | | | | | am 977ff542: Merge "Revert "Rename and flip meaning of auto-rotate to rotatio...Jeff Brown2012-06-051-10/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" int...Jeff Brown2012-06-051-10/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Revert "Rename and flip meaning of auto-rotate to rotation lock."Jeff Brown2012-06-051-10/+10