summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
* 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-091-3/+4
|/
* Wi-Fi calling settings cleanupPavel Zhamaitsiak2015-03-021-2/+1
* am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in ...Sanket Padawe2015-02-261-1/+7
|\
| * Use TelephonyManager api to get SPN of sim to display in UI.Sanket Padawe2015-02-241-1/+7
* | Add Wi-Fi Calling preference screenPavel Zhamaitsiak2015-02-256-1/+251
|/
* Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.Sanket Padawe2015-02-121-5/+12
* Use getDefaultAdapter instead of getNfcAdapterAndres Morales2015-02-021-2/+1
* Repair broken keychain wifi_uid logicRobin Lee2015-01-301-2/+2
* Remove sim status and imei for secondary user.Sanket Padawe2015-01-291-0/+7
* Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into...Pavel Zhamaitsiak2015-01-281-0/+52
|\
| * Add button in "hidden" settings to flip "VoLTE Provisioned" flagPavel Zhamaitsiak2015-01-221-0/+52
* | [DS] Correct the access method for telephony system propertyMick Lin2015-01-272-6/+13
* | Fix secondary data usage color regression.Jeff Sharkey2015-01-261-2/+4
* | Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-devSanket Padawe2015-01-231-1/+1
|\ \
| * | Hide APNs with type="ia" and apn=""Sanket Padawe2015-01-231-1/+1
* | | Merge "Show removed user's data usage under its correct item" into lmp-mr1-devZoltan Szatmary-Ban2015-01-231-3/+12
|\ \ \ | |_|/ |/| |
| * | Show removed user's data usage under its correct itemZoltan Szatmary-Ban2015-01-191-3/+12
| |/
* | Fixed data connection toggle crash in Settings.Sanket Padawe2015-01-201-0/+6
|/
* Merge "Do not perform SDP during pairing" into lmp-mr1-devAndre Eisenbach2015-01-162-17/+17
|\
| * Do not perform SDP during pairingAndre Eisenbach2015-01-152-17/+17
* | Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-devSvetoslav2015-01-152-2/+2
|\ \ | |/ |/|
| * Settings not showing print jobs for a managed profile.Svetoslav2015-01-132-2/+2
* | Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-devSanket Padawe2015-01-141-1/+1
|\ \
| * | Fixed missing sim card lock setup in Security Settings.Sanket Padawe2015-01-141-1/+1
* | | Merge "Fixed data connection toggle UI issue due to local cache maintained." ...Sanket Padawe2015-01-141-12/+28
|\ \ \ | |/ / |/| |
| * | Fixed data connection toggle UI issue due to local cache maintained.Sanket Padawe2015-01-141-12/+28
* | | Merge "[Settings] Wifi Setup responds to other connection state change" into ...Lucky Zhang2015-01-141-21/+44
|\ \ \ | |_|/ |/| |
| * | [Settings] Wifi Setup responds to other connection state changeLucky Zhang2015-01-131-21/+44
* | | Rename reg/unreg OnSubscriptionsChangedListener.Wink Saville2015-01-131-1/+1
| |/ |/|
* | Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-devSanket Padawe2015-01-091-3/+7
|\ \ | |/ |/|
| * Display Voice nw type if Data nw is Unknown for Sprout.Sanket Padawe2015-01-081-3/+7
* | Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-...Sanket Padawe2015-01-081-8/+10
|\ \ | |/ |/|
| * Fixed Cellular data toggling issue in settings for multisimSanket Padawe2015-01-081-8/+10
* | Merge "Block BluetoothPermissionRequest notification on managed profiles." in...Benjamin Franz2015-01-081-0/+7
|\ \ | |/ |/|
| * Block BluetoothPermissionRequest notification on managed profiles.Benjamin Franz2015-01-021-0/+7
* | Merge "Don't display Write NFC option if no NFC" into lmp-mr1-devAndres Morales2015-01-071-1/+4
|\ \
| * | Don't display Write NFC option if no NFCAndres Morales2015-01-061-1/+4
* | | Merge "Add an item to "Legal information" screen for WebView license" into lm...Mikhail Naganov2015-01-071-0/+6
|\ \ \
| * | | Add an item to "Legal information" screen for WebView licenseMikhail Naganov2015-01-061-0/+6
* | | | Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" i...Zoltan Szatmary-Ban2015-01-071-9/+7
|\ \ \ \
| * | | | Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted CredentialsZoltan Szatmary-Ban2015-01-051-9/+7
| | |_|/ | |/| |
* | | | Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.Sanket Padawe2015-01-061-1/+4
|/ / /
* | | Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-devPrem Kumar2014-12-291-10/+5
|\ \ \
| * | | SIM Status now shows data connection instead of voice.PauloftheWest2014-12-181-10/+5
* | | | Merge "Fixed settings crash issue while recovering from phone crash." into lm...Sanket Padawe2014-12-231-23/+30
|\ \ \ \
| * | | | Fixed settings crash issue while recovering from phone crash.Sanket Padawe2014-12-221-23/+30
* | | | | Merge "Removed extraneous slot information on single SIM devices." into lmp-m...PauloftheWest2014-12-191-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removed extraneous slot information on single SIM devices.PauloftheWest2014-12-181-2/+6
| |/ / /