summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SettingsActivity.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_app...Wolfgang Wiedmeyer2016-12-131-6/+23
|\
| * Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-0/+5
| |\
| | * Pre-setup restrictions DO NOT MERGEJason Monk2016-07-211-0/+5
| * | Allow restricted users to change status bar settingsSam Mortimer2016-08-041-0/+1
| * | Settings : Filter livelockscreen, button for secondary usersDanesh M2016-05-131-1/+0
| * | Add config to hide/show weather menuLuis Vidal2016-05-101-1/+4
| * | Setting : Don't show search for activities not within same shared user idDanesh M2016-04-261-1/+2
| * | Add Weather Content Provider [2/5]Luis Vidal2016-03-311-1/+9
| * | LLS: Add LiveLockScreenSettings to ENTRY_FRAGMENTSd34d2016-03-301-1/+3
| * | Move external input tile inclusion to device repo.Danny Baumann2016-03-211-3/+1
* | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_app...Wolfgang Wiedmeyer2016-03-181-1/+2
|\ \ \ | |/ /
| * | Settings : Add multiuser support for CMHardwareDanesh M2016-03-141-1/+2
* | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_app...Wolfgang Wiedmeyer2016-02-061-1/+1
|\ \ \ | |/ /
| * | Settings : Show search on all panelsDanesh M2016-02-021-1/+1
* | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_app...Wolfgang Wiedmeyer2016-01-141-5/+7
|\ \ \ | |/ /
| * | Integrate mobile network settings into SIM settings for MSIM.Danny Baumann2016-01-061-5/+7
* | | Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0Wolfgang Wiedmeyer2015-12-261-0/+6
|\ \ \ | |/ /
| * | Settings: Conditionally remove Buttons tile from DashboardBrandon McAnsh2015-12-221-0/+6
* | | always show dev settingsWolfgang Wiedmeyer2015-12-261-3/+1
|/ /
* | Settings: add switches for dashboard itemsRoman Birg2015-12-151-0/+5
* | Settings: Ignore externalIndex if its greater than dash category size.Adnan Begovic2015-12-141-1/+2
* | Settings: Add back oclick settingsMichael Bestas2015-12-121-1/+2
* | Settings: allow Profiles to be launched externallyRoman Birg2015-12-101-0/+2
* | Settings : Port over reorganization from 12.1Danesh M2015-12-081-19/+10
* | settings: contributors cloudJorge Ruesga2015-12-011-3/+4
* | Settings: Allow launching display rotation settings externallyMichael Bestas2015-11-281-0/+2
* | settings: Only show mobile_networks if we have telephonyChristopher R. Palmer2015-11-251-0/+5
* | privacy: Actually set the blacklist preferenceDiogo Ferreira2015-11-131-1/+1
* | Move Blacklist and Notif Filter to PrivacyAbhisek Devkota2015-11-131-0/+0
* | Add back blacklist settings.Danny Baumann2015-11-131-0/+2
* | Settings: Cleanup battery saver settingsMichael Bestas2015-11-031-2/+0
* | [2/2] Settings: Privacy GuardSam Mortimer2015-11-031-2/+5
* | livedisplay: Add LiveDisplay settingsSteve Kondik2015-10-291-0/+2
* | Settings : Add hooks for device specific featuresDanesh M2015-10-291-1/+2
* | Settings: squash of new profile UI for cm-12.0Roman Birg2015-10-261-0/+24
|/
* Bug: 22718745 Intents to 'draw over other apps' should go direct to the packa...Billy Lau2015-07-291-0/+4
* Settings: Add widget entry point to magical entry points listing.John Spurlock2015-06-191-0/+2
* Layout refinement for app listsJason Monk2015-06-161-0/+2
* Clean up settings shortcutsJason Monk2015-06-111-10/+14
* Implement default assist app settingXiyuan Xia2015-06-101-2/+2
* Hide search from everywhere but the dashboardJason Monk2015-06-021-5/+2
* Remove data item from app info when not supportedJason Monk2015-05-211-11/+2
* Merge "Remove the check hasMultipleUsers in Settings." into mnc-devNicolas Prevot2015-05-191-2/+1
|\
| * Remove the check hasMultipleUsers in Settings.Nicolas Prevot2015-05-141-2/+1
* | New UI for controlling USBNick Kralevich2015-05-131-2/+0
|/
* Settings: New DND access settings page.John Spurlock2015-05-081-0/+2
* Add high power whitelist for appsJason Monk2015-05-041-0/+2
* Update fingerprint settings to specJorim Jaggi2015-04-301-1/+1
* Merge "Settings: Do not disturb automatic rule updates." into mnc-devJohn Spurlock2015-04-301-0/+2
|\
| * Settings: Do not disturb automatic rule updates.John Spurlock2015-04-301-0/+2