summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider/res
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_bas...HEADreplicant-6.0-0001replicant-6.0Wolfgang Wiedmeyer2017-05-022-1/+23
|\
| * Automatic translation importAbhisek Devkota2017-04-281-1/+1
| * Automatic translation importAbhisek Devkota2017-02-191-0/+22
* | Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_bas...Wolfgang Wiedmeyer2017-02-111-10/+0
|\ \ | |/
| * Revert "Add overlay option for Settings.System.ACCELEROMETER_ROTATION_ANGLES"Zhao Wei Liew2017-01-241-7/+0
| * SettingsProvider: Remove def_notif_count overlayZhao Wei Liew2016-12-231-3/+0
* | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_b...Wolfgang Wiedmeyer2016-12-1226-2/+407
|\ \ | |/
| * Automatic translation importpinky@build012016-08-273-0/+66
| * Partially revert "Merge tag 'android-6.0.1_r22' of https://android.googlesour...Michael Bestas2016-05-045-2/+71
| * Automatic translation importMichael Bestas2016-04-161-0/+22
| * SettingsProvider: Allow default volume adjust sound to be overlayed.Ankit Gupta2016-04-061-0/+1
| * Automatic translation importMichael Bestas2016-04-061-0/+22
| * Automatic translation importMichael Bestas2016-03-282-0/+44
| * Automatic translation importMichael Bestas2016-03-1813-0/+181
* | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_b...Wolfgang Wiedmeyer2016-03-186-55/+10
|\ \ | |/
| * Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-116-71/+3
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-12-2178-0/+150
| | * Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-devBryce Lee2015-12-171-0/+1
| | |\
| | | * Add setting for declaring disabled bluetooth profiles.Bryce Lee2015-12-161-0/+1
| | * | am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NF...Martijn Coenen2015-07-291-0/+2
| | |\ \ | | | |/
| | | * am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment com...Martijn Coenen2015-07-291-0/+2
| | | |\
| * | | | SettingsProvider: allow ambient display/doze mode to be overlayedAnkit Gupta2016-03-041-0/+1
| * | | | Automatic translation importMichael Bestas2016-02-141-0/+22
* | | | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_b...Wolfgang Wiedmeyer2016-02-061-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Revert "SettingsProvider : Make WIFI_IDLE_MS into an overlay"Danesh M2016-02-051-3/+0
| * | | | SettingsProvider : Make WIFI_IDLE_MS into an overlayDanesh M2016-02-051-0/+3
| * | | | Default time format is hard coded to 24wangjing2016-02-031-2/+2
* | | | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_b...Wolfgang Wiedmeyer2016-01-281-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Support alert type profile default:Vibrator & Ringtone for settings.kaiyiz2016-01-221-0/+3
* | | | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_b...Wolfgang Wiedmeyer2016-01-146-0/+63
|\ \ \ \ \ | |/ / / /
| * | | | SettingsProvider: Disable data roaming by defaultGabriele M2016-01-121-1/+1
| * | | | Regional: Customize features for regional packagekaiyiz2016-01-041-0/+63
| * | | | SettingsProvider: Update icon.artas182x2016-01-035-0/+0
* | | | | Merge remote-tracking branch 'cyanogenmod/cm-13.0' into replicant-6.0Wolfgang Wiedmeyer2015-12-264-0/+88
|\ \ \ \ \ | |/ / / /
| * | | | Automatic translation importMichael Bestas2015-12-254-0/+88
* | | | | SettingsProvider: Correctly set animations settings and animator durationPaul Kocialkowski2015-12-181-0/+1
|/ / / /
* | | | Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/framework...Steve Kondik2015-11-161-0/+3
|\ \ \ \
| * | | | Support for configuring captive portal detection enabled by userLi Wei2015-10-221-0/+3
| | |_|/ | |/| |
* | | | fw: Move Notification LEDs settings to CMSettingsAdrianDC2015-11-161-8/+0
* | | | fw: Move Global settings to CMSettingsd34d2015-11-121-4/+0
* | | | fw: Move Secure settings to CMSettingsd34d2015-11-121-3/+0
* | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-0579-0/+125
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-181-0/+23
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-2978-0/+102
| |/ / /
* | | | Multiple LEDs [3/3]: Illumination Bars supportAdrianDC2015-10-281-0/+4
* | | | LEDs Brightness [2/2]: Lights notifications brightness supportAdrianDC2015-10-281-0/+4
* | | | Add overlay option for Settings.System.ACCELEROMETER_ROTATION_ANGLESHoward M. Harte2015-10-261-0/+7
* | | | protected SMS [1/4]Marcos Marado2015-10-261-0/+2
* | | | SettingsProvider: add default overlay entry for SEND_ACTION_APP_ERRORRoman Birg2015-10-261-0/+3
* | | | [1/2] Forward port power connect/disconnect notification supportSam Mortimer2015-10-261-0/+4