summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pick missing patch from cm12.1 for missing privacy iconKeith Mok2015-11-055-0/+12
| | | | | | | | | | | | | | 40304370ae6d5bc49dafa7d1fb13400cc2f82b78 Author: jrizzoli <joey@cyanogenmoditalia.it> Date: Fri Apr 24 15:00:28 2015 +0200 Settings: update dashboard icons 1a1820d2b33e1f7c1801b0cd839bb29ee91fa24d Author: blunden <blunden2@gmail.com> Date: Sat Dec 6 20:18:20 2014 +0100 Update the Privacy category drawable Change-Id: I587622df9a75d69405b17d60f0e8b0046ecf94f6
* Settings: Add new gesture vector drawable.Asher Simonds2015-11-052-1/+33
| | | | Change-Id: Ib25e9d19b6a93b5a6c713c54dcea93599ba8f60a
* perf: Fix typo when filtering perf profilesSteve Kondik2015-11-051-1/+1
| | | | Change-Id: I9c010c4fe03a5418af1fd22b12fadb4cc8e2a77d
* Break MSIM dependency on qci-telephony-frameworkRicardo Cerqueira2015-11-051-0/+4
| | | | | | | If the provisioning state is invalid, the framework is most likely absent. Consider the card as provisioned to pass all relevant checks. Change-Id: I975ff156e4328e9d3f6e2626a863bbacb29e3337
* Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-05143-1389/+6118
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: res/values-fr/strings.xml res/values-it/strings.xml res/values-ja/strings.xml res/values-nl/strings.xml res/values-pl/strings.xml res/values-ro/strings.xml res/values-ru/strings.xml res/values-zh-rCN/strings.xml res/values/bools.xml res/values/strings.xml res/xml/development_prefs.xml src/com/android/settings/DevelopmentSettings.java src/com/android/settings/DeviceInfoSettings.java src/com/android/settings/DisplaySettings.java Change-Id: I9fd9e793cf6097d950f8a1e30771c8bdf5067906
| * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-080-0/+0
| |\
| | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-060-0/+0
| | |\
| | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-020-0/+0
| | | |\
| | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-270-0/+0
| | | | |\
| | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-250-0/+0
| | | | | |\
| | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-240-0/+0
| | | | | | |\
| | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-230-0/+0
| | | | | | | |\
| | | | | | | | * Add a dummy string to help to add "fingerprint" to searchJim Miller2015-09-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 24172006 Change-Id: If4f3d9528aa6ac7daabc50ff247f6f542d4fd88c
| | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| | | | | | | | |\
| | | | | | | | | * Add color transform settingJason Monk2015-09-187-2/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24038268 Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
| | | | | | | | | * Update implementation to match BatteryStats.UidAdam Lesinski2015-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibdb7dc4b98c5a365c97bb56ad51e936b51892d3f
| | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-160-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-150-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-130-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-100-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-090-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-080-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-060-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-030-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-020-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-010-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-310-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-270-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-260-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * | Adapted string length translation limitsSelim Cinek2015-08-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23298302 Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
| | | | | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * | Stop crash on repeated enters on virtual keyboardPaul Lawrence2015-08-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change https://googleplex-android-review.git.corp.google.com/#/c/742462/ removed the mDone since graying out the button seemed to remove the need for this. However, you can also enter this command repeatedly from the soft keyboard. Put mDone back. Bug: 23181625 Change-Id: I42e8ecb9824b17825778c9c113130506cc3a200b
| | | | | | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | Added android.permission.PEERS_MAC_ADDRESS permissionFyodor Kupolov2015-07-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This permission is required for Settings to have access to BT/WiFi scan results even if location is turned off. Bug: 21852542 Bug: 22728628 Change-Id: I1b527f78077b45a326fd22d9b4ed92f9f806ff49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \