summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Expand)AuthorAgeFilesLines
* Settings: Remove all unused imports.John Spurlock2015-03-1871-187/+0
* Merge "Add option to reset network settings to factory"Stuart Scott2015-03-184-34/+422
|\
| * Add option to reset network settings to factoryStuart Scott2015-03-094-34/+422
* | Merge "Fix crash in app info"Jason Monk2015-03-181-3/+2
|\ \
| * | Fix crash in app infoJason Monk2015-03-181-3/+2
* | | Merge "Add data item to app info screen"Jason Monk2015-03-182-6/+141
|\ \ \
| * | | Add data item to app info screenJason Monk2015-03-182-6/+141
| |/ /
* | | Merge "Settings: Add a 'Cast' entry point under Sound & notification."John Spurlock2015-03-171-0/+2
|\ \ \ | |/ / |/| |
| * | Settings: Add a 'Cast' entry point under Sound & notification.John Spurlock2015-03-171-0/+2
* | | Stop using InputMethodUtils.isValidSystemDefaultImeYohei Yukawa2015-03-171-2/+5
|/ /
* | Merge "Merge profiles apps into app list"Jason Monk2015-03-165-90/+162
|\ \
| * | Merge profiles apps into app listJason Monk2015-03-165-90/+162
* | | Fix build harder.Narayan Kamath2015-03-161-1/+0
* | | Fix Settings build.Narayan Kamath2015-03-161-1/+1
* | | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande2015-03-167-1/+350
|\ \ \
| * \ \ Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc...Pavel Zhamaitsiak2015-03-101-0/+55
| |\ \ \
| | * \ \ Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc...Pavel Zhamaitsiak2015-03-101-0/+55
| | |\ \ \
| | | * | | Show alerts in case of some IMS registration errors.Pavel Zhamaitsiak2015-03-091-0/+55
| * | | | | Update Wi-Fi Calling mode when WFC is enabled/disabledPavel Zhamaitsiak2015-03-101-3/+4
| |\| | | |
| | * | | | Update Wi-Fi Calling mode when WFC is enabled/disabledPavel Zhamaitsiak2015-03-091-3/+4
| | |/ / /
| * | | | am "Do not provide 5GHz option for softap if there is no country code available"Vinit Deshpande2015-03-061-0/+15
| |\ \ \ \
| | * | | | Do not provide 5GHz option for softap if there is no country code availablexinhe2015-02-241-0/+15
| * | | | | am "set softAP on a specified band, including both 2.4 and 5 GHz band"Vinit Deshpande2015-03-061-1/+29
| |\| | | |
| | * | | | set softAP on a specified band, including both 2.4 and 5 GHz bandxinhe2015-01-161-1/+29
| * | | | | Wi-Fi calling settings cleanupPavel Zhamaitsiak2015-03-031-2/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Wi-Fi calling settings cleanupPavel Zhamaitsiak2015-03-021-2/+1
| * | | | | Update Multi-SIM setting to use getSubIdForPhoneAccount API.Santos Cordon2015-03-021-7/+5
| |/ / / /
| * | | | am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in ...Sanket Padawe2015-02-261-1/+7
| |\ \ \ \
| * | | | | Add Wi-Fi Calling preference screenPavel Zhamaitsiak2015-02-256-1/+251
* | | | | | Merge "Remove multi-window developer setting from search index if disabled."Wale Ogunwale2015-03-131-1/+4
|\ \ \ \ \ \
| * | | | | | Remove multi-window developer setting from search index if disabled.Wale Ogunwale2015-03-121-1/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Make default user icons retrievable as cached bitmaps"Zoltan Szatmary-Ban2015-03-132-6/+24
|\ \ \ \ \ \
| * | | | | | Make default user icons retrievable as cached bitmapsZoltan Szatmary-Ban2015-03-092-6/+24
| |/ / / / /
* | | | | | Merge "Add flag to hide disabled keyguard options."Jim Miller2015-03-123-11/+14
|\ \ \ \ \ \
| * | | | | | Add flag to hide disabled keyguard options.Jim Miller2015-03-123-11/+14
* | | | | | | Merge "Don't reset fingerprint storage on devices without fingerprint hw."Jim Miller2015-03-121-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Don't reset fingerprint storage on devices without fingerprint hw.Jim Miller2015-03-121-2/+2
| |/ / / / / /
* | | | | | | Merge "Follow-up on comments from splitting app info"Jason Monk2015-03-126-6/+25
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Follow-up on comments from splitting app infoJason Monk2015-03-036-6/+25
* | | | | | | Merge "Support some changes to SettingsLib"Jason Monk2015-03-123-55/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Support some changes to SettingsLibJason Monk2015-02-243-55/+4
* | | | | | | Merge "Implement additional fingerprint flows in Settings."Jim Miller2015-03-124-24/+326
|\ \ \ \ \ \ \
| * | | | | | | Implement additional fingerprint flows in Settings.Jim Miller2015-03-114-24/+326
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "[WifiSettings] Refactor Wi-Fi required info"Maurice Lam2015-03-111-1/+3
|\ \ \ \ \ \ \
| * | | | | | | [WifiSettings] Refactor Wi-Fi required infoMaurice Lam2015-03-111-1/+3
| |/ / / / / /
* / / / / / / Don't reset the keystore during password changeRobin Lee2015-03-061-1/+0
|/ / / / / /
* | | | | | Merge "Added Developer Options settings for multi-window mode."Wale Ogunwale2015-03-031-8/+61
|\ \ \ \ \ \
| * | | | | | Added Developer Options settings for multi-window mode.Wale Ogunwale2015-03-031-8/+61
* | | | | | | Merge "Prompt for lock pin on VPN screen when credential restriction is enabl...Julia Reynolds2015-03-031-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Prompt for lock pin on VPN screen when credential restriction is enabled.Julia Reynolds2015-03-031-1/+7