summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge "Settings: Move priority configuration to its own sub-settings page."John Spurlock2015-04-036-187/+329
|\
| * Settings: Move priority configuration to its own sub-settings page.John Spurlock2015-04-036-187/+329
* | Merge "Show current screen lock as summary"Jason Monk2015-04-031-0/+28
|\ \ | |/ |/|
| * Show current screen lock as summaryJason Monk2015-03-301-0/+28
* | Settings: Support new alarms-only zen value.John Spurlock2015-04-021-1/+3
* | Merge "Add default emergency app setting"Adrian Roos2015-04-021-0/+137
|\ \
| * | Add default emergency app settingAdrian Roos2015-04-021-0/+137
* | | Merge "provide better instructions for adding settings views."Chris Wren2015-04-023-0/+24
|\ \ \
| * | | provide better instructions for adding settings views.Chris Wren2015-04-023-0/+24
* | | | Merge "Prepare to make Fingerprint API public."Jim Miller2015-04-024-12/+12
|\ \ \ \
| * | | | Prepare to make Fingerprint API public.Jim Miller2015-04-014-12/+12
| | |/ / | |/| |
* | | | Merge changes from topic 'mwd-merge-040115'Etan Cohen2015-04-022-6/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Merge commit '2241607' into mergeEtan Cohen2015-03-311-5/+19
| |\ \ \
| | * \ \ Update Wi-Fi Calling settingsPavel Zhamaitsiak2015-03-231-5/+19
| | |\ \ \
| | | * | | Update Wi-Fi Calling settingsPavel Zhamaitsiak2015-03-231-5/+19
| * | | | | Merge commit 'fe47522' into mergeEtan Cohen2015-03-311-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Fix "Rename device" BT settings to avoid accepting blank spaces.Sanket Padawe2015-03-231-1/+1
* | | | | Move reset network settings into framework.Stuart Scott2015-03-301-92/+17
| |_|_|/ |/| | |
* | | | Merge "Add permissions screen to advanced apps"Jason Monk2015-03-303-1/+322
|\ \ \ \
| * | | | Add permissions screen to advanced appsJason Monk2015-03-303-1/+322
| |/ / /
* | | | log wifi actions from settingsChris Wren2015-03-302-1/+8
|/ / /
* | | Merge "Forget Wifi SSID"Stuart Scott2015-03-271-0/+1
|\ \ \
| * | | Forget Wifi SSIDStuart Scott2015-03-261-0/+1
* | | | Merge "Made scanning settings searchable"Lifu Tang2015-03-272-2/+12
|\ \ \ \
| * | | | Made scanning settings searchableLifu Tang2015-03-272-2/+12
* | | | | log visibility of viewsChris Wren2015-03-27116-53/+837
|/ / / /
* | | | Merge "Fix managed profile bugs in manage apps list"Jason Monk2015-03-261-11/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Fix managed profile bugs in manage apps listJason Monk2015-03-261-11/+14
* | | | Merge "Dont access PhoneFactory, as it could have been inited in another JVM."Stuart Scott2015-03-251-7/+5
|\ \ \ \
| * | | | Dont access PhoneFactory, as it could have been inited in another JVM.Stuart Scott2015-03-231-7/+5
* | | | | am f6432118: am 4a682e56: am c28e80b8: am 53eec9fa: Fix sim notifications.Stuart Scott2015-03-251-51/+34
|\ \ \ \ \
| * \ \ \ \ am c28e80b8: am 53eec9fa: Fix sim notifications.Stuart Scott2015-03-251-51/+34
| |\ \ \ \ \
| | * | | | | Fix sim notifications.Stuart Scott2015-03-251-51/+34
* | | | | | | Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'...Prerepa Viswanadham2015-03-255-48/+51
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into m...Prerepa Viswanadham2015-03-245-48/+51
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "Restore password visibility on screen rotation in Hotspot/Wifi setup."...Sanket Padawe2015-03-203-9/+21
| | |\ \ \ \ \ \
| | | * | | | | | Restore password visibility on screen rotation in Hotspot/Wifi setup.Sanket Padawe2015-03-203-9/+21
| | * | | | | | | Disable Wi-Fi Calling when getting "registration error" intent.Pavel Zhamaitsiak2015-03-181-2/+5
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Disable Wi-Fi Calling when getting "registration error" intent.Pavel Zhamaitsiak2015-03-121-2/+5
| | * | | | | | | Remove WFC Roaming settingPavel Zhamaitsiak2015-03-181-34/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Remove WFC Roaming settingPavel Zhamaitsiak2015-03-121-34/+1
| | * | | | | | | Add a developer settings checkbox to use the legacy DHCP client.Lorenzo Colitti2015-03-171-3/+23
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge "Update Settings to use new fingerprint API"Jim Miller2015-03-254-119/+139
|\ \ \ \ \ \ \ \
| * | | | | | | | Update Settings to use new fingerprint APIJim Miller2015-03-244-119/+139
* | | | | | | | | Merge "Allow system apps to add to settings dashboard"Jason Monk2015-03-259-36/+310
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow system apps to add to settings dashboardJason Monk2015-03-259-36/+310
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge "Add running services screen to developer options"Jason Monk2015-03-252-1/+130
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add running services screen to developer optionsJason Monk2015-03-252-1/+130
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Lauch manage permissions UI from settingsSvet Ganov2015-03-241-1/+16
* | | | | | | | Merge "Added a screen to configure wireless scanning"Lifu Tang2015-03-243-10/+96
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
generated by cgit v1.1 at 2024-09-09 08:18:54 +0000