summaryrefslogtreecommitdiffstats
path: root/res/values
Commit message (Expand)AuthorAgeFilesLines
* am ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-devZach Kuznia2015-10-012-0/+9
|\
| * Merge "Allow manual to be read from disk" into mnc-dr-devZach Kuznia2015-10-012-0/+9
| |\
| | * Allow manual to be read from diskZachary Kuznia2015-08-172-0/+9
* | | am 16a8e8d1: Make picture color mode less of a featureJason Monk2015-09-231-0/+3
|\ \ \ | |/ /
| * | Make picture color mode less of a featureJason Monk2015-09-231-0/+3
* | | am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into m...Jim Miller2015-09-191-0/+2
|\ \ \ | |/ /
| * | Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-devJim Miller2015-09-191-0/+2
| |\ \
| | * | Add summary for 0 fingerprint settings preferenceJim Miller2015-09-181-0/+2
* | | | am c6a96d40: Merge "Add color transform setting" into mnc-dr-devJustin Harrison2015-09-191-0/+18
|\ \ \ \ | |/ / /
| * | | Add color transform settingJason Monk2015-09-181-0/+18
| |/ /
* | | am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-...Jorim Jaggi2015-09-101-0/+5
|\ \ \ | |/ /
| * | Merge "Add double-tap power button to open camera 2/2" into mnc-dr-devJorim Jaggi2015-09-101-0/+5
| |\ \
| | * | Add double-tap power button to open camera 2/2Jorim Jaggi2015-09-091-0/+5
* | | | am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger...Jim Miller2015-09-091-0/+6
|\ \ \ \ | |/ / /
| * | | Handle fp enrollment errors more gracefullyJim Miller2015-09-091-0/+6
| |/ /
* | | am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr...Maurice Lam2015-09-021-3/+1
|\ \ \ | |/ /
| * | Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-devMaurice Lam2015-09-021-3/+1
| |\ \
| | * | [Fingerprint] Update strings for skip dialogMaurice Lam2015-09-021-3/+1
* | | | am 05c7dde1: To hide none security option, use config_hide_none_security_opti...Sungmin Choi2015-09-021-0/+3
|\ \ \ \ | |/ / /
| * | | To hide none security option, use config_hide_none_security_option configSungmin Choi2015-09-021-0/+3
| |/ /
* | | am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-devMaurice Lam2015-08-281-0/+7
|\ \ \ | |/ /
| * | [Fingerprint] Add skip dialog during SUWMaurice Lam2015-08-281-0/+7
* | | Refactor UidDetailProvider and its dependencies to SettingsLib.Wei Liu2015-08-252-2/+8
|/ /
* | am 19551115: Adapted string length translation limitsSelim Cinek2015-08-201-6/+6
|\ \ | |/ |/|
| * Adapted string length translation limitsSelim Cinek2015-08-201-6/+6
* | am f67d0785: Merge "Fix issue #23116383: Include security patch level in Sett...Dianne Hackborn2015-08-131-0/+2
|\ \ | |/
| * Merge "Fix issue #23116383: Include security patch level in Settings" into mn...Dianne Hackborn2015-08-131-0/+2
| |\
| | * Fix issue #23116383: Include security patch level in SettingsDianne Hackborn2015-08-121-0/+2
* | | am 8500822b: Merge "Fix issue #23079119: Description for write settings permi...Dianne Hackborn2015-08-111-8/+8
|\ \ \ | |/ /
| * | Merge "Fix issue #23079119: Description for write settings permission says......Dianne Hackborn2015-08-111-8/+8
| |\ \
| | * | Fix issue #23079119: Description for write settings permission says...Dianne Hackborn2015-08-111-8/+8
| | |/
* | | am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc...Maurice Lam2015-08-112-2/+13
|\ \ \ | |/ /
| * | Merge "[Fingerprint] Use different ring size for setup" into mnc-devMaurice Lam2015-08-112-2/+13
| |\ \ | | |/ | |/|
| | * [Fingerprint] Use different ring size for setupMaurice Lam2015-08-072-2/+13
* | | Merge "Add setting to disable camera gesture" into mnc-dr-devJason Monk2015-08-111-0/+7
|\ \ \
| * | | Add setting to disable camera gestureJason Monk2015-08-041-0/+7
* | | | am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" in...Dianne Hackborn2015-08-111-4/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Fix issue #23037720: New Battery Optimization StringsDianne Hackborn2015-08-101-4/+4
* | | | am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" in...Dianne Hackborn2015-08-071-0/+8
|\ \ \ \ | |/ / /
| * | | Fix issue #23037720: New Battery Optimization StringsDianne Hackborn2015-08-071-0/+8
| | |/ | |/|
| * | Merge "[Fingerprint] Update string for enrolling" into mnc-devMaurice Lam2015-08-051-5/+5
| |\ \
| | * | [Fingerprint] Update string for enrollingMaurice Lam2015-08-041-5/+5
* | | | am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-devMaurice Lam2015-08-051-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-devMaurice Lam2015-08-051-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | [Fingerprint] Shrink fingerprint progress ringMaurice Lam2015-08-041-2/+2
* | | | [Fingerprint] Update string for enrollingMaurice Lam2015-08-041-5/+5
* | | | resolved conflicts for merge of 1adca55f to mnc-dr-devJason Monk2015-08-041-8/+0
|\ \ \ \ | |/ / /
| * | | Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_T...Nick Kralevich2015-08-041-8/+0
| |\ \ \ | | |_|/ | |/| |
| | * | UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFERNick Kralevich2015-07-301-8/+0
* | | | Update USB dialog for USB-C power optionJason Monk2015-08-041-7/+31
|/ / /