summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...Steve Kondik2016-03-1083-548/+1006
|\
| * Import translations. DO NOT MERGEGeoff Mendal2016-01-2778-157/+355
| * Added toast message to color temperature settingSteve Pfetsch2016-01-221-2/+5
| * Import translations. DO NOT MERGEGeoff Mendal2016-01-1878-308/+542
| * Enable color temperature developer settingSteve Pfetsch2016-01-142-0/+9
| * Add strings for color temperature developer optionSteve Pfetsch2016-01-131-0/+7
| * Import translations. DO NOT MERGEGeoff Mendal2015-12-11160-44370/+59466
| * Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-12-12161-62354/+43940
| * Import translations. DO NOT MERGEGeoff Mendal2015-12-11161-43940/+62354
| * am a8f3f067: am ae8aea76: Merge "Allow manual to be read from disk" into mnc-...Zach Kuznia2015-10-013-0/+16
| |\
| | * am ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-devZach Kuznia2015-10-013-0/+16
| | |\
| * | \ am 2fd785e0: am 655ddae8: [Fingerprint] Fix link accessibilityMaurice Lam2015-09-251-3/+2
| |\ \ \ | | |/ /
| | * | am 655ddae8: [Fingerprint] Fix link accessibilityMaurice Lam2015-09-251-3/+2
| | |\ \
| * | \ \ am 3b06fd8b: am 16a8e8d1: Make picture color mode less of a featureJason Monk2015-09-233-6/+9
| |\ \ \ \ | | |/ / /
| | * | | am 16a8e8d1: Make picture color mode less of a featureJason Monk2015-09-233-6/+9
| | |\ \ \
| * | \ \ \ am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings prefe...Jim Miller2015-09-191-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into m...Jim Miller2015-09-191-0/+2
| | |\ \ \ \
| * | \ \ \ \ am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-devJustin Harrison2015-09-195-2/+48
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am c6a96d40: Merge "Add color transform setting" into mnc-dr-devJustin Harrison2015-09-195-2/+48
| | |\ \ \ \ \
| * | \ \ \ \ \ am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" in...Paul Lawrence2015-09-182-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-devPaul Lawrence2015-09-182-0/+2
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ am ef5f9e39: am 48422b52: Merge "Add double-tap power button to open camera 2...Jorim Jaggi2015-09-102-0/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-...Jorim Jaggi2015-09-102-0/+11
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully ...Jim Miller2015-09-091-0/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger...Jim Miller2015-09-091-0/+6
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog...Maurice Lam2015-09-021-3/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr...Maurice Lam2015-09-021-3/+1
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_...Sungmin Choi2015-09-022-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 05c7dde1: To hide none security option, use config_hide_none_security_opti...Sungmin Choi2015-09-022-0/+23
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" in...Maurice Lam2015-08-281-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-devMaurice Lam2015-08-281-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.Wei Liu2015-08-252-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Refactor UidDetailProvider and its dependencies to SettingsLib.Wei Liu2015-08-252-2/+8
| * | | | | | | | | | | | | am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limitsSelim Cinek2015-08-201-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am dba47d0c: am 19551115: Adapted string length translation limitsSelim Cinek2015-08-201-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ am 4d06defe: am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into m...Maurice Lam2015-08-201-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-devMaurice Lam2015-08-191-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include se...Dianne Hackborn2015-08-132-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch ...Dianne Hackborn2015-08-132-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Descriptio...Dianne Hackborn2015-08-111-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write s...Dianne Hackborn2015-08-111-8/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different rin...Maurice Lam2015-08-115-6/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for se...Maurice Lam2015-08-115-6/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into ...Jason Monk2015-08-112-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-devJason Monk2015-08-112-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Batter...Dianne Hackborn2015-08-111-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimizatio...Dianne Hackborn2015-08-111-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Batter...Dianne Hackborn2015-08-071-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimizatio...Dianne Hackborn2015-08-071-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprin...Maurice Lam2015-08-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /