summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove unused and unnecessary code from subtype enabler" into lmp-devTadashi G. Takaoka2014-07-211-71/+0
|\
| * Remove unused and unnecessary code from subtype enablerTadashi G. Takaoka2014-07-211-71/+0
* | Follow API change from *Blocked to *HiddenAmith Yamasani2014-07-211-7/+7
* | Merge "Fix Notification Access layout for tabletUI support" into lmp-devFabrice Di Meglio2014-07-211-6/+6
|\ \
| * | Fix Notification Access layout for tabletUI supportFabrice Di Meglio2014-07-211-6/+6
* | | Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.AC...Fabrice Di Meglio2014-07-171-0/+4
|\| |
| * | Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_AP...Fabrice Di Meglio2014-07-211-0/+4
* | | Merge "Fix AppDetails padding on tablet UI" into lmp-devFabrice Di Meglio2014-07-202-11/+22
|\| |
| * | Fix AppDetails padding on tablet UIFabrice Di Meglio2014-07-182-11/+22
* | | Merge "Add Screen pinning back to settings" into lmp-devJason Monk2014-07-204-2/+141
|\ \ \ | |_|/ |/| |
| * | Add Screen pinning back to settingsJason Monk2014-07-214-2/+141
* | | Fix showing list of languages for picoTTSPrzemyslaw Szczepaniak2014-07-211-1/+1
|/ /
* | Merge "Make TTS setting transition animation consistent." into lmp-devPrzemyslaw Szczepaniak2014-07-171-1/+0
|\ \
| * | Make TTS setting transition animation consistent.Przemyslaw Szczepaniak2014-07-171-1/+0
* | | Fix Settings behavior when disabling current IMETadashi G. Takaoka2014-07-191-1/+0
* | | Merge "Remove unnecessary saved persistent preference" into lmp-devTadashi G. Takaoka2014-07-173-28/+33
|\ \ \
| * | | Remove unnecessary saved persistent preferenceTadashi G. Takaoka2014-07-183-28/+33
* | | | Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-devFabrice Di Meglio2014-07-171-5/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix Utils.prepareCustomPreferencesList()Fabrice Di Meglio2014-07-181-5/+9
* | | | Merge "Fix the way we select and apply Themes" into lmp-devFabrice Di Meglio2014-07-181-4/+9
|\| | |
| * | | Fix the way we select and apply ThemesFabrice Di Meglio2014-07-181-4/+9
* | | | Merge "Fix overdraw and do some layout optimizations" into lmp-devFabrice Di Meglio2014-07-181-5/+6
|\| | |
| * | | Fix overdraw and do some layout optimizationsFabrice Di Meglio2014-07-181-5/+6
* | | | Update Settings to use new UsageStats APIAdam Lesinski2014-07-181-92/+85
* | | | Merge "Link WifiAssistant card with actual settings." into lmp-devJeff Davidson2014-07-171-28/+74
|\ \ \ \
| * | | | Link WifiAssistant card with actual settings.Jeff Davidson2014-07-171-28/+74
| | |_|/ | |/| |
* | | | Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-devMaurice Lam2014-07-173-121/+145
|\ \ \ \ | |_|_|/ |/| | |
| * | | [WifiSetup] Mechanism for suspending auto finishMaurice Lam2014-07-173-121/+145
* | | | On factory reset, wipe the stored account challengesAndres Morales2014-07-181-0/+9
* | | | Merge "Improvements to user settings" into lmp-devAmith Yamasani2014-07-171-18/+91
|\ \ \ \
| * | | | Improvements to user settingsAmith Yamasani2014-07-171-18/+91
* | | | | Hide Settings launcher icon for a managed profileAlexandra Gherghina2014-07-181-0/+46
* | | | | Merge "Add account for managed user" into lmp-devAlexandra Gherghina2014-07-171-11/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add account for managed userAlexandra Gherghina2014-07-171-11/+4
| |/ / /
* | | | Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-devMichael Wright2014-07-171-4/+6
|\ \ \ \
| * | | | Add OP_PROJECT_MEDIA to AppOpsMichael Wright2014-07-161-4/+6
* | | | | Merge "Update Location Settings for Enterprise" into lmp-devZoltan Szatmary-Ban2014-07-171-41/+43
|\ \ \ \ \
| * | | | | Update Location Settings for EnterpriseZoltan Szatmary-Ban2014-07-171-41/+43
| | |_|/ / | |/| | |
* | | | | Merge "Access high contrast setting directly" into lmp-devChris Craik2014-07-171-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Access high contrast setting directlyChris Craik2014-07-171-1/+2
* | | | | Remove account for a managed userAlexandra Gherghina2014-07-171-2/+2
* | | | | Handle managing accounts for a managed profileAlexandra Gherghina2014-07-172-24/+69
* | | | | Merge "Handle choosing and adding accounts for a managed profile" into lmp-devAlexandra Gherghina2014-07-177-38/+170
|\ \ \ \ \
| * | | | | Handle choosing and adding accounts for a managed profileAlexandra Gherghina2014-07-177-38/+170
| * | | | | Revert "Update Location Settings for Enterprise" due toAmith Yamasani2014-07-171-43/+41
| * | | | | Update Location Settings for EnterpriseZoltan Szatmary-Ban2014-07-171-41/+43
| | |/ / / | |/| | |
* | | | | Merge "Battery chart fixes." into lmp-devDianne Hackborn2014-07-174-20/+106
|\ \ \ \ \
| * | | | | Battery chart fixes.Dianne Hackborn2014-07-174-20/+106
| |/ / / /
* / / / / Follow split of DISALLOW_TELEPHONYAmith Yamasani2014-07-171-6/+11
|/ / / /
* | | | Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-devFabrice Di Meglio2014-07-162-1/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|