summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* InCallUI: Validate function return value to avoid NPEcm-11.0-XNPH05Q-tomato-9828f8e9ccstable/cm-11.0-XNF8Yshipping/cm-11.0Marcos Marado2014-11-191-0/+5
| | | | | Change-Id: I265860937d9489ef52934be759637a868349a23e (cherry picked from commit 70be315247d92cc8f30d0e9e7a984a0e52cd233a)
* Merge branch 'cm-11.0' into stable/cm-11.0Brint E. Kriebel2014-11-180-0/+0
|\
| * Automatic translation importMichael Bestas2014-11-101-1/+1
| | | | | | | | Change-Id: I967b89b45288b660d7df6737ef34fd490adfa50e
* | Automatic translation importMichael Bestas2014-11-101-1/+1
| | | | | | | | | | Change-Id: I967b89b45288b660d7df6737ef34fd490adfa50e (cherry picked from commit 1aad47cfcde90cbb91832911c5c30ef7964c948b)
* | Merge branch 'cm-11.0' into stable/cm-11.0Brint E. Kriebel2014-11-0317-18/+412
|\| | | | | | | | | | | | | | | Conflicts: res/values-fr/cm_strings.xml res/values-nl/cm_strings.xml Change-Id: I6313434f76233a9c5c37edbf665033656dd305e2
| * InCallUI: Use global settings name for MSIMcretin452014-10-303-13/+5
| | | | | | | | Change-Id: Iaf0f6f29c61baa04ba42dad1cfa4b14602ef5731
| * Automatic translation importMichael Bestas2014-10-273-0/+45
| | | | | | | | Change-Id: Ib0ede62a119aa9c66dcbf70d2dd769ff9dbce52f
| * InCallUI: Minor UI cleanup for displaying sim namecretin452014-10-232-1/+4
| | | | | | | | Change-Id: I9f532b0c115375c435d9d5fff770202004597a98
| * Automatic translation importMichael Bestas2014-10-213-1/+91
| | | | | | | | Change-Id: I493219a28ac29163e77b860501f8d1cbdeb9d344
| * Automatic translation importMichael Bestas2014-10-1510-4/+268
| | | | | | | | Change-Id: Ief978251c8fbed03f718784c53d504c40c64ffb9
| * Automatic translation importMichael Bestas2014-10-044-3/+57
| | | | | | | | Change-Id: I71debc6f376069946f97d53068020e9b58cd92ef
* | Automatic translation importMichael Bestas2014-10-054-3/+57
| | | | | | | | | | Change-Id: I71debc6f376069946f97d53068020e9b58cd92ef (cherry picked from commit 1d071ab0a542a379422cc283e3953ef56b324cc9)
* | Merge branch 'cm-11.0' into stable/cm-11.0Brint E. Kriebel2014-10-01115-1989/+1510
|\|
| * Automatic translation importMichael Bestas2014-09-2982-1831/+827
| | | | | | | | Change-Id: Ib381078a3497d94eac0f49794269412e4a3c654f
| * InCallUI: Remove unused stringsMichael Bestas2014-09-241-7/+0
| | | | | | | | Change-Id: I70684a5852f868624f585fa78c94d6ecfbe83394
| * InCallUI: Move CAF stringsMichael Bestas2014-09-182-51/+56
| | | | | | | | Change-Id: I9965e9455460c6c1c1e1c8e7b5f95230f25bdf66
| * Merge "MSIM: Fix fragment class names" into cm-11.0Ricardo Cerqueira2014-09-172-2/+2
| |\
| | * MSIM: Fix fragment class namesRicardo Cerqueira2014-09-172-2/+2
| | | | | | | | | | | | Change-Id: Ie85f68b6f8a1bb852578872a824fdff6f1474d60
| * | Stats: track how frequently contact images are present incallemancebo2014-09-151-0/+5
| |/ | | | | | | | | | | | | | | | | | | For retail devices (and installer builds), introduce tags to be read by a separate, additional, package. This will not be read or collected in any community (nightly/M/etc) or self-built build. Change-Id: I7f52f18a53ade50e0274af633cb7c26566332ee7
| * InCallUI: Improve some stringsMichael Bestas2014-09-131-2/+2
| | | | | | | | Change-Id: I9b90d507fafd0efeb64415878fb1f2fd291f01d4
| * Automatic translation importMichael Bestas2014-09-132-0/+24
| | | | | | | | Change-Id: I432ddb2432d156a11210cd40e5e32eb7d962b150
| * InCallUI: fix smartcover always showing answer fragmentRoman Birg2014-09-111-2/+0
| | | | | | | | | | | | | | | | It seems the deleted lines were causing the issue as InCallUI properly handles logic for showing and hiding the fragment itself. Change-Id: I1d45b49ae48931adf48faa555296a467373e9247 Signed-off-by: Roman Birg <roman@cyngn.com>
| * Improve strings.Danny Baumann2014-09-053-33/+23
| | | | | | | | | | | | Also removed weird toast position code. Change-Id: I917a35f228e1ca765802f73a2d654a3bf9311578
| * InCallUI CMCC: disable volume boost by defaultemancebo2014-09-043-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The volume boost button in the InCall UI attempts to boost the volume by setting parameters on the AudioManager. This only works if there is hardware support for the volume_boost=on parameter. If enabling volume boost with setParameters doesn't work, then getParameters will not surface the parameter, which creates a confusing user experience because we will report "volume boost disabled" whenever the user presses the button (when the expected behavior is to toggle it). This should really only be enabled if it is supported, so this disables it by default. Change-Id: I0b0458f63a9d1524c887c5a8d45cff937aceacf1
| * MSIM(DSDA): Use new methods in accordance with new designSandeep Kunta2014-09-043-13/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | 1. Delete setActiveSubRetainLch and 2. Use setActiveAndConversationSub when both active sub & Conversation Subscription to be set, for example when user switching sub explicitly. 3. Call setActiveSubscription only for MSIM. Conflicts: src/com/android/incallui/CallCommandClient.java Change-Id: I1ef194cfbf717bbaea1b66d5c95c3b845dfaa21d CRs-Fixed: 659123
| * InCallUI: Update mute state accordingly after adding callkaiyiz2014-09-042-0/+19
| | | | | | | | | | | | | | | | | | | | | | The mute state of sub1 that is stored in the mute table isn't restored to the previous state when the second call(on sub2) is connected. Restore the mute state for sub1 in CallButtonPresenter#refreshMuteState(). CRs-Fixed: 660470 Change-Id: I7e829d3eefe246801021571e0028085204f1f499
| * Fix to mute/unmute properly while adding a callRavindra2014-09-042-3/+15
| | | | | | | | | | | | | | | | Call setMuteInternal instead of setMute while adding call to an existing active call. Change-Id: I9c9efa22d8b5d6ddf00ba19e866cdb153474f5c8 CRs-Fixed: 650135
| * Ims: Handle START_READY_EVT and STOP_READY_EVTRavi Paluri2014-09-042-17/+74
| | | | | | | | | | | | | | | | | | | | | | | | 1. These two events will be used by Telephony and the VT library to synchronize camera recording: Start Recording and Stop Recording. 2. Telephony shall start camera recording only after receiving START_READY_EVT. 3. After receiving STOP_READY_EVT telephony shall wait for START_READY_EVENT before starting camera recording. Change-Id: Iee919158ddc8ade5df7deb7225d897f4b629cb27 CRs-Fixed: 621548
| * IMS-VT: Fix abandoned GLConsumerRavi Paluri2014-09-041-9/+24
| | | | | | | | | | | | | | | | | | Fix abandoned GLConsumer by correcting sequence mismatch of surface destroy called when the dialog is dismissed and surfacetexture release Change-Id: I9583f28c8a675c4c5859b94965341c22f400d013 CRs-Fixed: 630861
| * InCallUI: Do not dismiss the keyguard when there is active callkaiyiz2014-09-043-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The InCallUI will dismiss the keyguard when there is active call. Add a config to check whether we need to dismiss the Keyguard screen when there is active call, we set false as default. CRs-Fixed: 688484 Conflicts: src/com/android/incallui/InCallPresenter.java Change-Id: Ifd0dbb322562464efacb9c5a8234d55055c9e8e4
| * InCallUI: Hide sim label when when calling sub is absentkaiyiz2014-09-042-8/+18
| | | | | | | | | | | | | | | | | | | | | | When make emergency call without sim card, the sim card index 0 will be used. If the state of calling sub is absent, hide the sim label. CRs-Fixed: 683248 Change-Id: Ib912ec0751c0d7942e08e04c34c32df0f2a21bb7
| * TeleService: Show answer UI and hide manage conference panel for MT CALLkaiyiz2014-09-043-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The answer UI is shown, but it is covered by the manage conference call fragment. When show the answer UI, hide the manage conference call fragment. CRs-Fixed: 657336 Conflicts: src/com/android/incallui/InCallActivity.java Change-Id: Ifea4e08e7ea7e2d6dd61632b8cc5d2d92aa09df3
| * InCallUI: Fix the repeated appending for the input number from HID.Chen Bing2014-09-041-14/+23
| | | | | | | | | | | | | | | | | | In DTMFKeyListener,the input numbers would be appended twice by its parent and itself. Solution: Don't append the input numbers in DTMFKeyListener. Change-Id: Ie3f6049a5d4bd7aa541438ce519d86a89e520f63 CRs-Fixed: 656603
| * MSIM(DSDA): Fix incoming call answering issue.Sandeep Gutta2014-09-042-7/+18
| | | | | | | | | | | | | | | | | | | | By the time incall answer activity starts, if device has any incoming calls present on any subscription process all of them. -Add few log messages which helps in debugging dsda issue. Change-Id: I8177ad998ecead001ae82df2956abb8a857aadbd CRs-Fixed: 652167
| * InCallUI: Use NoActionBar theme for InCallActivitykaiyiz2014-09-042-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InCallActivity and MsimInCallActivity has actionBar, however the actionBar shows faster than the activity, so even though activity hide the actionBar, it still display for a moment. Use NoActionBar theme as the parent theme for InCallActivity in stead of Theme.Holo, and set the theme with actionBar for MsimInCallActivity. CRs-Fixed: 659881 Conflicts: res/values/styles.xml Change-Id: Iabf539c691389c856f021e0b9e6cfd0e9e8c1650
| * InCallUI: Get sim name according to system setting on DSDS modekaiyiz2014-09-041-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Only use sim name that is accroding to English on DSDS mode. Get sim name according to system setting on DSDS mode. CRs-Fixed: 652237 Conflicts: src/com/android/incallui/CallCardFragment.java Change-Id: I63fe5f05d1f04cdbef58af46677ed4ba7246671e
| * InCallUI: Call internalResolveIntent() in onCreat() methodkaiyiz2014-09-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only call internalResolveIntent() method in onNewIntent() method, if the user exit InCallUI with back key, and re-enter it via dialer, the dialpad will not be displayed. Call internalResolveIntent() in onCreat() method. CRs-Fixed: 654611 Conflicts: src/com/android/incallui/InCallActivity.java Change-Id: I23ef123c556aeb191bd041b478becd149ac408ec
| * InCallUI: Dismiss reject sms dialogs when press back key on DSDA modekaiyiz2014-09-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On DSDA mode, when the user press back key, it does not dismiss reject sms dialogs, mCannedResponsePopup and mCustomMessagePopup are not set to null. Then hasPendingDialogs() will return false, so the user can not finish InCallUI with back key when the incoming call is hung up. Dismiss reject sms dialogs and set the dialog to null once the dialog is cancelled by the user. CRs-Fixed: 654387 Change-Id: Ic45a0906b38383a9a919df82b00e4f2010fac1cb
| * InCallUI: Get sim name according to system settingkaiyiz2014-09-041-1/+7
| | | | | | | | | | | | | | | | | | | | Only use sim name that is accroding to English. Get sim name according to system setting CRs-Fixed: 652237 Change-Id: I75ecf011ff989da9a16f0753876164cc3c61ad8c
| * Fix no sound hear when one call disconnected.mengsun2014-09-042-0/+31
| | | | | | | | | | | | | | Reset current activated subscription when call state changed. CRs-Fixed: 638094 Change-Id: Ie65483a8b2880ae0529a943c6ccb16d0ed9b3b04
| * InCallUI: Do not show subscription info during an Internet callkaiyiz2014-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Show subscription info during an Internet call. Do not show the subscription info when isSipCall is true. CRs-Fixed: 643468 Conflicts: src/com/android/incallui/CallCardFragment.java Change-Id: I7cdee61a2f04b20d7040201bd264b5679678de25
| * InCallUI: Set system bar enabled when InCallScreen goto backgroundkaiyiz2014-09-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | During an incomming call and InCallScreen goto background, the system bar is still disabled. Set system bar enabled when InCallScreen goto background. CRs-Fixed: 637132 Conflicts: src/com/android/incallui/InCallActivity.java Change-Id: Iaf2af6f392ac0096521783cd4febca6c3003635d
| * Fix can not active the call in the other sub when one sub is callingmengsun2014-09-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | The active sub is changed to a incorrect sub on phone state changed event which is earlier than incoming call event, so set the incoming call sub as active sub again when incoming call event got. CRs-Fixed: 625303 Conflicts: src/com/android/incallui/CallList.java Change-Id: Ibcbfc59f7d7f059d8fc04e0fd4f0c385152f9307
| * InCallUI: Use the correct key to get the multi sim cards' namekaiyiz2014-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | Sim1 card gets its value from "perferred_name_sub0", it should gets its value from "perferred_name_sub1". Use the correct key to get the multi sim cards' name. CRs-Fixed: 625174 Change-Id: I610bfc442523ef2752fe128993a1df72a38168b2
| * VolumeBoost : Add support for TTY HCO mode.huiwan2014-09-021-1/+10
| | | | | | | | | | | | | | | | | | | | | | Enable volume boost icon in TTY HCO(TTY + Earpiece) in UI layer. CRs-fixed: 530337 Conflicts: src/com/android/incallui/CallCardFragment.java Change-Id: Ic60a561e0ed9dad4ccb87cea964b24cfc4783883
| * InCallUI: Update AddParticipant and Modifycall buttons when reject callkaiyiz2014-09-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When reject a call, the AddParticipant and Modifycall buttons are not updated because the isEnabled is false, so they are still visible. Set AddParticipant and Modifycall invisible when isEnable is false. CRs-Fixed: 621909 Conflicts: src/com/android/incallui/CallButtonPresenter.java Change-Id: I35513bd5b98376721596354a24d6b01fa07dab9d
| * InCallUI: Disable volume boost during IMS callemancebo2014-09-021-1/+4
| | | | | | | | | | | | | | Extracted from 7ecc9d97de6c3c9bb74d6ad5ccdcda257d801a25 caf/LNX.LA.3.7.2.1 to separate it out from call recording changes we don't want to pickup Change-Id: Idc3c989d6808d690232d4405a9e4fb201cb839bf
| * MSIM(DSDA): Retain LCH mode of other active sub for MT far-end disconnect.Muhammed Siju2014-09-024-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a call is ended by remote party on one sub, if an active call is present in other sub, set the other sub as active while retaining it's LCH state. If the call was disconnected locally, disable LCH for the other active sub. Conflicts: src/com/android/incallui/CallCommandClient.java CRs-Fixed: 548848 Change-Id: I31e0fd445e243fcabbca39eb8498ba99c55a96a1
| * InCallUI : volume boost unexpected turn offhuiwan2014-09-022-1/+7
| | | | | | | | | | | | | | | | | | Fix the volume boost unexpected turn off when hold phone or Call status changed. CRs-Fixed: 601169 Change-Id: I32370189e1e4cdcb975df756f48d683752dc619c
| * InCallUI : Update volume boost UI iconHuiWang2014-09-029-0/+0
| | | | | | | | | | | | Update volume boost UI new icon. Change-Id: I3474504c64d0547aa7f6ed411b293e0d28a7a7e4
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 02:58:32 +0000