summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix discovery state tracking"Irfan Sheriff2012-03-291-13/+13
|\
| * Fix discovery state trackingIrfan Sheriff2012-03-281-13/+13
* | Merge "Only enable multi-user settings if a secure settings flag is set"Amith Yamasani2012-03-281-1/+9
|\ \
| * | Only enable multi-user settings if a secure settings flag is setAmith Yamasani2012-03-281-1/+9
* | | Merge "Convert to new KeyStore format"Kenny Root2012-03-271-3/+29
|\ \ \
| * | | Convert to new KeyStore formatKenny Root2012-03-211-3/+29
* | | | Merge "Update Wifi to use new keystore function"Kenny Root2012-03-271-8/+11
|\ \ \ \
| * | | | Update Wifi to use new keystore functionKenny Root2012-03-211-8/+11
| |/ / /
* | | | Merge "Switch VPN to use keystore ENGINE"Kenny Root2012-03-271-3/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Switch VPN to use keystore ENGINEKenny Root2012-03-211-3/+6
| |/ /
* | | User management screensAmith Yamasani2012-03-274-13/+444
| |/ |/|
* | Fix 6101396: Added password check when turning biometric weak liveliness offDanielle Millett2012-03-231-5/+34
* | Merge "Cluster apps by user in Data Usage."Jeff Sharkey2012-03-222-73/+94
|\ \
| * | Cluster apps by user in Data Usage.Jeff Sharkey2012-03-222-73/+94
* | | Merge "Added a liveliness check box preference for Face Unlock."Danielle Millett2012-03-221-0/+12
|\ \ \
| * | | Added a liveliness check box preference for Face Unlock.Danielle Millett2012-03-211-0/+12
| |/ /
* | | Merge commit '50339f3'Mike Lockwood2012-03-211-2/+0
|\ \ \ | |/ / |/| |
| * | turn off log spewJoe Onorato2012-02-271-2/+0
| * | am 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment....Justin Ho2012-01-201-1/+10
| |\ \
| * \ \ am 999f23e2: Locale string comparisons must ignore case.Narayan Kamath2012-01-201-1/+1
| |\ \ \
| * \ \ \ am af487099: Merge "Fix 4560303: Add setting to lock later when power button ...Jim Miller2012-01-101-0/+11
| |\ \ \ \
| * \ \ \ \ am aaff44c8: Don\'t allow wifi tethering when running monkeys.Amith Yamasani2012-01-091-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ am da68fd46: Merge "Android OS battery usage overstated by screen on time" in...Todd Poynor2012-01-051-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not availableKazuhiro Ondo2011-12-201-0/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 3feacdf3: Add Sprint update menuMeng Hu2011-12-081-0/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 325c912a: Merge "VpnSettings: add support for server certificates." into i...Chia-chi Yeh2011-12-073-10/+26
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 7d10591a: Fix NPE in advanced settingsIrfan Sheriff2011-12-071-4/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 9ef669a6: am d03c1511: Remove watchdog setting for poor network avoidanceIrfan Sheriff2011-12-071-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 7e8dcbea: Adding a system preference whether to speak passwords in accessi...Svetoslav Ganov2011-12-071-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am bbcc300c: Merge "Set the same vibrate settings for ringer and notification...Amith Yamasani2011-12-021-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am fa81de9b: Merge "Potential fix for NPE in Running services." into ics-mr1Amith Yamasani2011-12-021-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1663522e: Merge "Fixed layout for "Available Devices" in Bluetooth" into i...Gilles Debunne2011-12-021-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8266d1aa: Merge "Fix 5636798: Watch for SIM state changes in IccSettings."...Jim Miller2011-12-011-32/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e9b79e3a: Merge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1Daniel Sandler2011-11-304-427/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 95b26e1a: Merge "Overhaul vibrate and silent settings to match hard keys."...Amith Yamasani2011-11-303-144/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1Daniel Sandler2011-11-291-12/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2fa017f8: Merge "fix datetime layout for phones and remove orientation loc...Freeman Ng2011-11-211-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6f0ea441: Settings changes for Android Dreams (now Screen Candy).Daniel Sandler2011-11-194-69/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cee089b1: Merge "Show desk dock apps as screen savers." into ics-mr1Daniel Sandler2011-11-161-0/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b08c1102: Merge "Kill the Switch on top-right after exiting Accounts & syn...Amith Yamasani2011-11-151-8/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cd76b687: Merge "Dismiss dialogs properly on closing." into ics-mr1Amith Yamasani2011-11-151-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am af925284: Add compatibility aliases for shortcuts added to home screen in ...Amith Yamasani2011-11-141-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4b94e073: Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1Jeff Sharkey2011-11-113-21/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6519c610: Merge "Potential fix for monkey crash." into ics-mr1Amith Yamasani2011-11-101-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2ad06bbd: Merge "Remove system tutorial option in Settings->About." into i...Amith Yamasani2011-11-091-11/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 81dfecf8: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662...Jeff Brown2011-11-093-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2eb32b00: Merge "Prevent orphaned fragment on the settings stack." into ic...Amith Yamasani2011-11-091-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 179b3286: Merge "Adding an improve face matching settings option for Face ...Danielle Millett2011-11-084-10/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 322da591 to ics-aahJason Simmons2011-11-082-1/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8214d201: Merge "Fix two bug in the TTS settings." into ics-mr1Narayan Kamath2011-11-071-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-08-05 18:07:27 +0000