summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* set softAP on a specified band, including both 2.4 and 5 GHz bandxinhe2015-01-161-1/+29
| | | | | Bug:18929692 Change-Id: I455e9b17e5091596beb0246ccfd981c5d2b932f0
* 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
| | | | | | | | | | Bug: 18714691 Change-Id: Ia2e9642d3331126a040ae1a059300df65d9551b9
* | Merge "Fixed settings crash issue while recovering from phone crash." into ↵Sanket Padawe2014-12-231-23/+30
|\ \ | | | | | | | | | lmp-mr1-dev
| * | Fixed settings crash issue while recovering from phone crash.Sanket Padawe2014-12-221-23/+30
| | | | | | | | | | | | | | | Bug: 18816868 Change-Id: I2b3015f563aed2d997a3a5466ca8f0689fc53ddb
* | | Merge "Removed extraneous slot information on single SIM devices." into ↵PauloftheWest2014-12-191-2/+6
|\ \ \ | |/ / |/| | | | | lmp-mr1-dev
| * | Removed extraneous slot information on single SIM devices.PauloftheWest2014-12-181-2/+6
| |/ | | | | | | | | Bug: 18803333 Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
* / Getting mcc/mnc from system prop instead of subInfoRecord.Sanket Padawe2014-12-181-2/+4
|/ | | | | Bug: 18781129 Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
* Revert "Getting mcc/mnc from system prop instead of subInfoRecord."Sanket Padawe2014-12-181-6/+4
| | | | | | This reverts commit 579b66f28da710b5a1e68e211f5bd54ea466ab8b. Change-Id: I0b142b40c697992b60bca9020673a0828ec44977
* Getting mcc/mnc from system prop instead of subInfoRecord.Sanket Padawe2014-12-171-4/+6
| | | | | Bug: 18781129 Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
* Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-devJason Monk2014-12-165-88/+357
|\
| * Add a periodic check of the tethering provisioningJason Monk2014-12-115-88/+357
| | | | | | | | | | | | | | | | | | | | | | Add a service that handles the check through broadcasts which are defined through configs, similar to the previous configs for the activity. Depends on I1f6e2d954562c5a16a0de60dac625005ec3e5c50 Bug: 18453076 Change-Id: I515d72706e9ca37877e67c44427af1b75b146390
* | Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-devSanket Padawe2014-12-161-2/+5
|\ \
| * | Prevent sim notify popup after upgrade from k to LMR1.Sanket Padawe2014-12-151-2/+5
| | | | | | | | | | | | | | | Bug: 18705619 Change-Id: I6de4d20172c69358c1853e6a00c68fc353c7dad7
* | | Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-devSanket Padawe2014-12-161-0/+7
|\ \ \
| * | | Exiting activity on clicking outside dialog acitivity.Sanket Padawe2014-12-111-0/+7
| | | | | | | | | | | | | | | | | | | | Bug: 18705619 Change-Id: I50cb08884f1c97352f5ad3a3e7d218b42af1ada4
* | | | Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-devPauloftheWest2014-12-151-4/+13
|\ \ \ \
| * | | | Fixed then icons of SIMs in the call dialog.PauloftheWest2014-12-121-4/+13
| | |/ / | |/| | | | | | | | | | | | | | Bug: 18672758 Change-Id: I812e79a48b048f8449cc07fdcccab57a114cdd24
* | | | Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-devWink Saville2014-12-151-1/+1
|\ \ \ \
| * | | | Use getLIn1NumberForSubscriber to get phone number.Wink Saville2014-12-151-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 18721557 Change-Id: I255627638efe21362315286a659ac59b46e1fa30 Signed-off-by: Wink Saville <wink@google.com>
* | | | Merge "Show toast when cellular data option is changing." into lmp-mr1-devStuart Scott2014-12-152-158/+3
|\ \ \ \
| * | | | Show toast when cellular data option is changing.Stuart Scott2014-12-102-158/+3
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 18594162 Change-Id: I19dc265af47c0a40a6ace6d4bf42e21e035daf0a
* | | | | IMEI information will show without a SIM.PauloftheWest2014-12-151-21/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18701340 Change-Id: I1e92bd1af4d68849f194d30b5b894cfb144900e5
* | | | | Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-devLucky Zhang2014-12-131-3/+3
|\ \ \ \ \
| * | | | | [FRP] Notification screen slides in wrong directionLucky Zhang2014-12-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method that launches notification screen from choose lock activity finished the original activity before starting the new activity. This made the system think it is a backward transition instead of a forward one. Swapping the order to start new activity first and then finish old activity fixed the problem. This also changes the behavior in settings. However, it seems like this is also the desired behavior for settings. Bug: 18723199 Change-Id: I90538fa52e0d62a2274c8e0333682035849802c6
* | | | | | Settings: Allow more lines of saver feature description text.John Spurlock2014-12-121-0/+50
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | Bug: 18706906 Change-Id: I27bfd5e70c3e20c17fcad691cfb3c9f74d7d0390
* | | | | Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.Wink Saville2014-12-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18668873 Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
* | | | | Merge "Bring up correct app for Recent location list items" into lmp-mr1-devZoltan Szatmary-Ban2014-12-111-4/+6
|\ \ \ \ \
| * | | | | Bring up correct app for Recent location list itemsZoltan Szatmary-Ban2014-12-091-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking on a list item in Settings > Location > Recent locations, the correct app should be shown for items corresponding to managed profile apps. Bug: 17655978 Change-Id: Ie4b388f0ea103ee16629b0d8d92e5de08adffc5e
* | | | | | Merge "Disabled SIM notifications while provisioning." into lmp-mr1-devPauloftheWest2014-12-111-2/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Disabled SIM notifications while provisioning.PauloftheWest2014-12-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18672853 Change-Id: I01ba2927ad013649f13b959354a6493ba057e09f
* | | | | | Merge "Fixed a Data Usage crash" into lmp-mr1-devPauloftheWest2014-12-101-3/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixed a Data Usage crashPauloftheWest2014-12-101-3/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 18364933 Change-Id: I80657c6541aec0b4706ef4aa229c9f858776aab2
* | | | | Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-devAlexandra Gherghina2014-12-101-2/+7
|\ \ \ \ \
| * | | | | Fix NPE in Running Processes view in Apps SettingsAlexandra Gherghina2014-12-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18676587 Change-Id: Ib4b400241f0ebd6dd4aacad4bfdda6dfb75cdfb5
* | | | | | Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into ↵Emily Bernier2014-12-101-1/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | lmp-mr1-dev
| * | | | | Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivityEmily Bernier2014-12-091-1/+5
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, NETWORK_STATE_CHANGED_ACTION broadcasts are sent before the current network state has been updated in ConnectivityService. Listening for CONNECTIVITY_ACTION broadcasts as well ensures that we properly catch new connections and auto-advance appropriately. Bug: 18503725 Change-Id: Ia414d57d196d09171342fb3ae93c7e826cb1a1aa
* | | | | Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-devMaurice Lam2014-12-101-1/+20
|\ \ \ \ \
| * | | | | [FRP] Shrink lock screen when keyboard pops upMaurice Lam2014-12-081-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because setup wizard uses immersive mode, the default adjustResize flag doesn't work; so we need to respond to window insets manually. Bug: 18651680 Change-Id: I9e53d3455c41404cca8a347b49b559200353b7ac
* | | | | | Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-devPauloftheWest2014-12-091-2/+11
|\ \ \ \ \ \
| * | | | | | Added Multi-SIM capability to Access Point NamesPauloftheWest2014-12-081-2/+11
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + In Settings->More->Cellular networks->AccessPoint Names will display the APNs for the selected SubscriptionInfo. Bug: 18246837 Change-Id: If8f46c2fa82cf4b2051ddb5f15afc8c59cb9b850
* | | | | | Merge "Fixed a SIM Lock UI issue" into lmp-mr1-devPauloftheWest2014-12-092-3/+25
|\ \ \ \ \ \
| * | | | | | Fixed a SIM Lock UI issuePauloftheWest2014-12-082-3/+25
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + The SIM lock option will now appear if there is any SIM with locking capabilities. + Also, if the first slot does not have a SIM in it, then the SIM lock screen will disable the ability to lock the first slot. Bug: 18473536 Change-Id: Ib4e0ed6e94b00bc07c9febdad433fdb3c55294b8
* | | | | | Merge "Add debug dataEnable." into lmp-mr1-devWink Saville2014-12-091-5/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add debug dataEnable.Wink Saville2014-12-051-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c2c49d9283652429affc190abacf7775ef3fe43
* | | | | | Merge "Fixed a SIM Cards crash." into lmp-mr1-devPrem Kumar2014-12-091-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed a SIM Cards crash.PauloftheWest2014-12-081-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added a check if getActiveSubscriptionInfoList returns null. Bug: 18634751 Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
* | | | | | Merge "Settings: Rebind to volume sliders after returning from stopped." ↵John Spurlock2014-12-081-11/+16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | into lmp-mr1-dev
| * | | | | Settings: Rebind to volume sliders after returning from stopped.John Spurlock2014-12-081-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18118623 Change-Id: I29fb22a1a4476639a4f5cce06affd8ce58b6105d
* | | | | | Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-devJeff Sharkey2014-12-082-140/+8
|\ \ \ \ \ \