Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Pick missing patch from cm12.1 for missing privacy icon | Keith Mok | 2015-11-05 | 5 | -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 Simonds | 2015-11-05 | 2 | -1/+33 |
| | | | | Change-Id: Ib25e9d19b6a93b5a6c713c54dcea93599ba8f60a | ||||
* | perf: Fix typo when filtering perf profiles | Steve Kondik | 2015-11-05 | 1 | -1/+1 |
| | | | | Change-Id: I9c010c4fe03a5418af1fd22b12fadb4cc8e2a77d | ||||
* | Break MSIM dependency on qci-telephony-framework | Ricardo Cerqueira | 2015-11-05 | 1 | -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 HEAD | Ricardo Cerqueira | 2015-11-05 | 143 | -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-dev | The Android Automerger | 2015-10-08 | 0 | -0/+0 |
| |\ | |||||
| | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-10-06 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-10-02 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-27 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-25 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-24 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-23 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | Add a dummy string to help to add "fingerprint" to search | Jim Miller | 2015-09-22 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 24172006 Change-Id: If4f3d9528aa6ac7daabc50ff247f6f542d4fd88c | ||||
| | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-20 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | Add color transform setting | Jason Monk | 2015-09-18 | 7 | -2/+255 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24038268 Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6 | ||||
| | | | | | | | | * | Update implementation to match BatteryStats.Uid | Adam Lesinski | 2015-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibdb7dc4b98c5a365c97bb56ad51e936b51892d3f | ||||
| | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-16 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-15 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-13 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-10 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-09 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-06 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-03 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-02 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-01 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-31 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-29 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-29 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | |/| | |||||
| | | | | | | | | | | | | | | | | | | | * | | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-26 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-25 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-22 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | * | | Adapted string length translation limits | Selim Cinek | 2015-08-20 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23298302 Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70 | ||||
| | | | | | | | | | | | | | | | | | | | | | | | * | | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-20 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | * | | Stop crash on repeated enters on virtual keyboard | Paul Lawrence | 2015-08-19 | 1 | -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-dev | The Android Automerger | 2015-08-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-15 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-13 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-12 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-11 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-06 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-05 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-04 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-01 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | Added android.permission.PEERS_MAC_ADDRESS permission | Fyodor Kupolov | 2015-07-30 | 1 | -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-dev | The Android Automerger | 2015-07-30 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-29 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ |