summaryrefslogtreecommitdiff
path: root/InCallUI
AgeCommit message (Collapse)Author
2015-11-09Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I87a8b82f53956e2318b98d849c6821e7487cc998 Auto-generated-cl: translation import
2015-11-04Merge "Retrieving nameAlternative for ContactInfo" into ↵Brandon Maxwell
ub-contactsdialer-a-dev am: 0a73c3dafc am: f92f12cf25 * commit 'f92f12cf25c9d2a453932649d3aae017a60484fd': Retrieving nameAlternative for ContactInfo
2015-11-04Merge "Retrieving nameAlternative for ContactInfo" into ub-contactsdialer-a-devBrandon Maxwell
am: 0a73c3dafc * commit '0a73c3dafcca070636b7825049267993b9d06f70': Retrieving nameAlternative for ContactInfo
2015-11-04Merge "Retrieving nameAlternative for ContactInfo" into ub-contactsdialer-a-devBrandon Maxwell
2015-11-04Merge "Fix Open Now in Contact Context to account for after midnight times." ↵Nancy Chen
into ub-contactsdialer-a-dev am: 2a42a410d0 am: c6b6bfa1b3 * commit 'c6b6bfa1b3931315c305d121b71eb005563c5223': Fix Open Now in Contact Context to account for after midnight times.
2015-11-04Merge "Fix Open Now in Contact Context to account for after midnight times." ↵Nancy Chen
into ub-contactsdialer-a-dev am: 2a42a410d0 * commit '2a42a410d0929efae29b8892f0897b7c06c3283e': Fix Open Now in Contact Context to account for after midnight times.
2015-11-04Merge "Fix Open Now in Contact Context to account for after midnight times." ↵Nancy Chen
into ub-contactsdialer-a-dev
2015-11-04Merge "Log number of conference child calls" into ub-contactsdialer-a-dev ↵Yorke Lee
am: 6db499fd7b am: 0781936537 * commit '0781936537e09c26651a0f20acadcd75d57bc7b7': Log number of conference child calls
2015-11-04Merge "Log number of conference child calls" into ub-contactsdialer-a-devYorke Lee
am: 6db499fd7b * commit '6db499fd7bb4c8127e7af4c2ec99f99a5005ddf0': Log number of conference child calls
2015-11-04Merge "Log number of conference child calls" into ub-contactsdialer-a-devYorke Lee
2015-11-04Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I3abb42386ca54eef299b10f2b9ba33b1e0845a88 Auto-generated-cl: translation import
2015-11-04Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ic36aedf3e0244282323c31a5f986f93796a25393 Auto-generated-cl: translation import
2015-11-03Retrieving nameAlternative for ContactInfoBrandon Maxwell
Bug:19364093 Change-Id: I965707f5623db8b16bf5089b4bff3202db4192ec
2015-11-03Updating InCallUI to respect name display and sort preferencesBrandon Maxwell
am: 22d8bab818 * commit '22d8bab8180d07ef4d32e6d14b0fd646109bed4c': Updating InCallUI to respect name display and sort preferences
2015-11-03Fix Open Now in Contact Context to account for after midnight times.Nancy Chen
Originally the close time was set to the same date as the open time, but sometimes a place is open past midnight, which means that it's open until the next day. Update this so that Open Now correctly represents the state even when the place is open past midnight. Bug: 25345785 Change-Id: I417ecb046bb2d5f708279f2b3808af0afd7662c7
2015-11-03Log number of conference child callsYorke Lee
Bug: 23164804 Change-Id: Ib9b639ecce88eeafcf9624c1d78374eb9664fd71
2015-11-03Updating InCallUI to respect name display and sort preferencesBrandon Maxwell
+ CallCardPresenter, StatusBarNotifier, ConferenceParticipantListAdapter respect display name preferences + ConferenceParticipantListAdapter sorts names in conference call based on sort order preference ~ Still need to populate data objects with real data, currently it's just stubbed Bug: 19364093 Change-Id: I77ad9cb063bf439ae7e5551e40946ea29e414b7f
2015-10-31Merge "Cleanup isBlockedNumber calls." into ub-contactsdialer-a-devAndrew Lee
am: 1ec63c8b1d * commit '1ec63c8b1d2bd6115a565e64690fe5c656f8c56d': Cleanup isBlockedNumber calls.
2015-10-31Merge "Cleanup isBlockedNumber calls." into ub-contactsdialer-a-devAndrew Lee
2015-10-30Cleanup isBlockedNumber calls.Andrew Lee
Bug: 25343277 Change-Id: Ie087e6cf231384dee07b4d93f86d2d69dc85f482
2015-10-30Update function name from mark => delete.Andrew Lee
am: 56639f1fcd * commit '56639f1fcdaf0277b20ce7b6b936a7c9212a114c': Update function name from mark => delete.
2015-10-30Update function name from mark => delete.Andrew Lee
Now, blocked calls will be deleted instead of marked as BLOCKED. Bug: 25378068 Change-Id: I4d9f10804057df55cc194a743fa7076f5d1c66bb
2015-10-28Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I20ae90986fab888d7b88e9f2f9cfcdf9f0b63d83 Auto-generated-cl: translation import
2015-10-28Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I5b084bc98ee049947916bf4aa715920b829e2e84 Auto-generated-cl: translation import
2015-10-26Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I61ae520c169b3b38bd85e9bf22247d3719095738 Auto-generated-cl: translation import
2015-10-26Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I2fab8b4083eb725576ab039da46d6cbb1fa4b6a6 Auto-generated-cl: translation import
2015-10-24Merge "Add the city/locality to the displayed business information." into ↵Nancy Chen
ub-contactsdialer-a-dev am: af4aa7bec6 * commit 'af4aa7bec64b92bf97885809f15bfd0ac42423a8': Add the city/locality to the displayed business information.
2015-10-24Merge "Fix indenting in primary_call_info.xml." into ub-contactsdialer-a-devNancy Chen
am: 61e78fa725 * commit '61e78fa72550ad327a35dcb9562c704f7f373dd6': Fix indenting in primary_call_info.xml.
2015-10-24Merge "Add the city/locality to the displayed business information." into ↵Nancy Chen
ub-contactsdialer-a-dev
2015-10-23Add the city/locality to the displayed business information.Nancy Chen
To disambiguate, include the city/locality with the address in the form "[street address], [city/locality]" in the contact interactions. Also add tests to ensure the construction of the location info is correct. Bug: 23351559 Change-Id: Ib0b2ce8a80a8494d5b006a6a74ad94447befc0ef
2015-10-24Merge "Fix indenting in primary_call_info.xml." into ub-contactsdialer-a-devNancy Chen
2015-10-23Fix indenting in primary_call_info.xml.Nancy Chen
This is to fix intentional incorrect indenting when the original change was submitted because the indentations made it hard to do a code comparison. This change does NOT modify functionality at all, it is simply a +4 indent for the linear layout "primary_call_banner". Bug: 23351559 Change-Id: I6b891c96d18e91489911e2f2d79c88e09ccc9ef5
2015-10-23Merge "Set the contact context background to the incall theme color." into ↵Nancy Chen
ub-contactsdialer-a-dev am: dbf5677337 * commit 'dbf5677337dd5dd29858096af9f36edba3f31104': Set the contact context background to the incall theme color.
2015-10-23Merge "Set the contact context background to the incall theme color." into ↵Nancy Chen
ub-contactsdialer-a-dev
2015-10-23Set the contact context background to the incall theme color.Nancy Chen
Was setting the wrong layout element's background so the correct layout's background was not being changed. Bug: 25221808 Change-Id: I8184d449254da97162f41bc0a0faee14b84382d3
2015-10-22Merge "Remove unused InCallUI drawables" into ub-contactsdialer-a-devYorke Lee
am: 84ef8e6a1f * commit '84ef8e6a1f72df740349e0619c33fbac105f4ebc': Remove unused InCallUI drawables
2015-10-22Merge "Remove unused InCallUI drawables" into ub-contactsdialer-a-devYorke Lee
2015-10-22Remove unused InCallUI drawablesYorke Lee
Change-Id: I702c3a57913bb9f03c167732334f103d58f01c95
2015-10-22Merge "Add hours of operation info to incall business context." into ↵Nancy Chen
ub-contactsdialer-a-dev am: 9f8bdaf654 * commit '9f8bdaf654877f617bc42568e8559180283182e3': Add hours of operation info to incall business context.
2015-10-22Merge "Add hours of operation info to incall business context." into ↵Nancy Chen
ub-contactsdialer-a-dev
2015-10-22Merge "Fixed highlighter stuck on dialpad while in call." into ↵Ta-wei Yen
ub-contactsdialer-a-dev am: 399e445506 * commit '399e4455060ae2007503900e5d8f976076bfebaa': Fixed highlighter stuck on dialpad while in call.
2015-10-22Merge "Fixed highlighter stuck on dialpad while in call." into ↵Ta-wei Yen
ub-contactsdialer-a-dev
2015-10-21Add hours of operation info to incall business context.Nancy Chen
Display hours of operation information if it is available. If hours of operation are available, also determine whether it is currently open or closed. Display in the InCallUI when making a business call. Also add tests to make sure that the business context object is constructed correctly. Bug: 23351559 Change-Id: Ic2846e54e15ade37ccf0b916651cc3388da3cc23
2015-10-21Fixed highlighter stuck on dialpad while in call.Ta-wei Yen
+ InCallActivity.showDialpadFragment() now returns a boolean to indicate if changes are actually made. Bug: 18930766 Change-Id: Ib00859a58b289f988606e6427b1d874a69231fbb
2015-10-21Merge "New layout for business call context." into ub-contactsdialer-a-devNancy Chen
am: 21b7f500eb * commit '21b7f500ebeefc0e282b1f1071a59da9b8f2b1e9': New layout for business call context.
2015-10-21Merge "New layout for business call context." into ub-contactsdialer-a-devNancy Chen
2015-10-21New layout for business call context.Nancy Chen
Add smaller photo in primary call content so that the photo that is obscured by the context information is visible somewhere. Update the "business info" header to be in line with the new mocks. Bug: 23351559 Change-Id: I98fc2b192bc1fa9452a4d7b5299c98162af232a9
2015-10-21Disable call blocking after emergency call.Andrew Lee
am: 8983b5540b * commit '8983b5540b9cf1a773737a17fc4704d13ebf922b': Disable call blocking after emergency call.
2015-10-21Disable call blocking after emergency call.Andrew Lee
+ Record the time at which an emergency call is disconnected. + Use utility to check if last emergency call was within threshold (eg. 48 hours) and don't attempt to block call if so. Bug: 24418319 Change-Id: I69e13f9c9617a567d7b5d807aee21578fa5606c2
2015-10-20Update InCallUI testsYorke Lee
am: 6cfdc3f48a * commit '6cfdc3f48a5cea5ae33fa3c5e1b8e942a636d8ee': Update InCallUI tests
2015-10-20am e7eddd94: am 3a576b7a: Fix bitmap leaks in InCallUI am: 24ad92950aYorke Lee
am: 6917baaabe * commit '6917baaabe14be845cc3ab558f4798e9963211a9': Fix bitmap leaks in InCallUI
2015-10-20Update InCallUI testsYorke Lee
* Update all tests with @SmallTest, @MediumTest or @LargeTest annotation to ensure coverage by continuous test infrastructure Change-Id: If362edd2afbef0b3484ad74f53e7d6339156742e
2015-10-19am e7eddd94: am 3a576b7a: Fix bitmap leaks in InCallUI am: 24ad92950aYorke Lee
* commit 'e7eddd946a6517163bd0d3baaa643e7e18043373': Fix bitmap leaks in InCallUI
2015-10-19am 3a576b7a: Fix bitmap leaks in InCallUI am: 24ad92950aYorke Lee
* commit '3a576b7ab31275801064d2e1875b5fe8e06ea612': Fix bitmap leaks in InCallUI
2015-10-19Fix bitmap leaks in InCallUIYorke Lee
am: 24ad92950a * commit '24ad92950a39af862c676f18e07b88ecde2f4e3b': Fix bitmap leaks in InCallUI
2015-10-19DO NOT MERGE Fix bitmap leaks in InCallUIYorke Lee
Fix the bitmap leaks in InCallUI that were a result of StatusBarNotifier instances being retained across calls. Bitmap -> StatusBarNotifier -> CallUpdateListenerMap -> CallList Bug: 25003292 Change-Id: I4f8695d7dfbc397b0fee0305a6f94e8d2e8e593f
2015-10-19Fix bitmap leaks in InCallUIYorke Lee
Fix the bitmap leaks in InCallUI that were a result of StatusBarNotifier instances being retained across calls. Bitmap -> StatusBarNotifier -> CallUpdateListenerMap -> CallList Bug: 25003292 Change-Id: I4f8695d7dfbc397b0fee0305a6f94e8d2e8e593f
2015-10-19Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I6fce3f033e540888f9b8a810de03b0b87d4b3a17 Auto-generated-cl: translation import
2015-10-14Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I1aa3ded1cb6b4260ad4936a9728651e6f67143f6 Auto-generated-cl: translation import
2015-10-12am 5ab00a4b: Merge "Add location information with business caller ID." into ↵Nancy Chen
ub-contactsdialer-a-dev * commit '5ab00a4b0aa7ae87f8b29f194715cfa6eda14aa5': Add location information with business caller ID.
2015-10-12Merge "Add location information with business caller ID." into ↵Nancy Chen
ub-contactsdialer-a-dev
2015-10-12Add location information with business caller ID.Nancy Chen
Display business address and distance when available when calling businesses. This information is only displayed during outgoing calls and while in the call. Bug: 23351559 Change-Id: Ifb9197cc3abf6d865e13de10862c610e8aa15fba
2015-10-12Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I636faa541c6b088035e6417995e6940cece96de2 Auto-generated-cl: translation import
2015-10-08am b644c3dc: am e5d18339: Merge "Cannot input the DTMF number from Bluetooth ↵Yorke Lee
device" * commit 'b644c3dccb5331641fb6e1166320d45b6acbb740': Cannot input the DTMF number from Bluetooth device
2015-10-08am e5d18339: Merge "Cannot input the DTMF number from Bluetooth device"Yorke Lee
* commit 'e5d18339a614b2921a22f304659560d2b50b70e3': Cannot input the DTMF number from Bluetooth device
2015-10-08DO NOT MERGE Cannot input the DTMF number from Bluetooth deviceSuzuki Masumi
Only KEYEVENT_DPAD_CENTER is handled as a select key in DTMF dial pad. However, select key from some Bluetooth devices is KEYEVENT_ENTER. Change-Id: I33e339d591fc14626c01fc7e7bf9788f88ef180f
2015-10-08Cannot input the DTMF number from Bluetooth deviceSuzuki Masumi
Only KEYEVENT_DPAD_CENTER is handled as a select key in DTMF dial pad. However, select key from some Bluetooth devices is KEYEVENT_ENTER. Change-Id: I33e339d591fc14626c01fc7e7bf9788f88ef180f
2015-10-07am 1de53df7: Don\'t cancel previous notification if none existed previouslyYorke Lee
* commit '1de53df7c468e6dd11e50fdf408823fa7ed1012f': Don't cancel previous notification if none existed previously
2015-10-07Don't cancel previous notification if none existed previouslyYorke Lee
Bug: 24607839 Change-Id: I2f8737d8ed2101c4572b7570627016a465e3bd44
2015-10-07am 0de21104: am 177debf2: am 9849b290: am 070463fa: Merge "Handle child ↵Tyler Gunn
number changes after the call starts." into mnc-dr-dev * commit '0de21104d5ca7aca9b1e3a092a706d0bffcf90b3': Handle child number changes after the call starts.
2015-10-07am 9849b290: am 070463fa: Merge "Handle child number changes after the call ↵Tyler Gunn
starts." into mnc-dr-dev * commit '9849b29079f43a29e65886b0d26d2a07344b8d2a': Handle child number changes after the call starts.
2015-10-07am 070463fa: Merge "Handle child number changes after the call starts." into ↵Tyler Gunn
mnc-dr-dev * commit '070463fa5c8cb252464ad6aae936131f8c939636': Handle child number changes after the call starts.
2015-10-07Merge "Handle child number changes after the call starts." into mnc-dr-devTyler Gunn
2015-10-07Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Id41d59a0f90dcc24c00a39843dc35d2667416cf6 Auto-generated-cl: translation import
2015-10-07Merge "DO NOT MERGE Fix potential mismatched caller information" into ↵Yorke Lee
ub-contactsdialer-a-dev
2015-10-07DO NOT MERGE Fix potential mismatched caller informationYorke Lee
This fixes a bug where caller information returned for a call waiting would be mistakenedly applied to an existing call by ensuring that the returned contact information is only assigned to the call that initiated the lookup. 1) Active call A is in progress 2) Incoming call B (call waiting) 3) Contact info lookup is initiated for call B 4) Call B is rejected 5) Contact info is returned 6) UI for call A is updated with the returned info Bug: 24591055 Change-Id: I41e0741d8bc01a2fe98d77cb080d1df455b1e5df
2015-10-06am 3b115d29: am 511440fb: am ad6e03a4: am 568a22f1: Fix potential mismatched ↵Yorke Lee
caller information * commit '3b115d297260b401d4350df48ecfd89cd7b235f2': Fix potential mismatched caller information
2015-10-06am ad6e03a4: am 568a22f1: Fix potential mismatched caller informationYorke Lee
* commit 'ad6e03a4087000459bd82b0b49366dcd18117e4b': Fix potential mismatched caller information
2015-10-06am 568a22f1: Fix potential mismatched caller informationYorke Lee
* commit '568a22f1d76c83e02b3494a506c21663897d85bb': Fix potential mismatched caller information
2015-10-06Handle child number changes after the call starts.Tyler Gunn
The child number display functionality assumed that the child number for a call would only bet set at the start of the call. This change removes that assumption and supports changes to the child number at any point during the call by adding a new listener to the InCall Call List. It appears there are some instances in reality where the child number can come in after the start of a call (delayed only slightly, but enough to prevent the number from showing up). Bug: 24585039 Change-Id: I23148e8c4265f1bc16ce563f2919e9b3eb71784f
2015-10-06am 818d5f37: Refactor call blocking into InCallPresenter.Andrew Lee
* commit '818d5f375ad01f115b587540e235ba6e12c7a300': Refactor call blocking into InCallPresenter.
2015-10-06Refactor call blocking into InCallPresenter.Andrew Lee
This retains CallList being context-independent, and consolidates most of the logic. This makes InCallPresenter responsible for calling into the CallList to add/remove/cleanup calls. This will make it easier to hook in emergency call logic which needs a Context to store the time an outgoing emergency call is made. Also, remove the timeout runnable if the BlockedNumberContentObserver unregisters after successfully updating the call log. Bug: 24418319 Change-Id: I6a203f5a260428f51e7965c73e3eee89edb949bd
2015-10-05am 157087d1: Return Mock TelephonyManager for test.Andrew Lee
* commit '157087d1939c5541cf6217fb9cd30b4f01e22e28': Return Mock TelephonyManager for test.
2015-10-02Return Mock TelephonyManager for test.Andrew Lee
Bug: 24341350 Change-Id: Ie47faafcb834083b4a6877e713d871d8283886f7
2015-10-02am ad15aa74: Merge "PhoneStateListener & ContentObserver for blocked calls." ↵Andrew Lee
into ub-contactsdialer-a-dev * commit 'ad15aa744ccbda7b3e4e3ba12a30adf34bf022c4': PhoneStateListener & ContentObserver for blocked calls.
2015-10-02Merge "PhoneStateListener & ContentObserver for blocked calls." into ↵Andrew Lee
ub-contactsdialer-a-dev
2015-10-02Fix potential mismatched caller informationYorke Lee
This fixes a bug where caller information returned for a call waiting would be mistakenedly applied to an existing call by ensuring that the returned contact information is only assigned to the call that initiated the lookup. 1) Active call A is in progress 2) Incoming call B (call waiting) 3) Contact info lookup is initiated for call B 4) Call B is rejected 5) Contact info is returned 6) UI for call A is updated with the returned info Bug: 24591055 Change-Id: I41e0741d8bc01a2fe98d77cb080d1df455b1e5df
2015-10-02am a7c92ed3: Addressing comments in ag/777742.Nancy Chen
* commit 'a7c92ed3c01da1d885f4c73c275b47f8de368696': Addressing comments in ag/777742.
2015-10-02Addressing comments in ag/777742.Nancy Chen
Submitted pre-maturely, addressing comments in previous CL. Bug: 23351559 Change-Id: Ieb0932268b98626811956c3f90e8050e1abe445a
2015-10-02am ab3711d5: Merge "Adapter logic for adding call context to call card ↵Nancy Chen
fragment." into ub-contactsdialer-a-dev * commit 'ab3711d50fce245c7f7ac9a3b9466ff14b6229e2': Adapter logic for adding call context to call card fragment.
2015-10-02Merge "Adapter logic for adding call context to call card fragment." into ↵Nancy Chen
ub-contactsdialer-a-dev
2015-10-01Adapter logic for adding call context to call card fragment.Nancy Chen
+ Adapter for call context list view + Method in CallCardFragment that handles properly displaying the call context information + Strings for the call context title Note: the setCallContext method is currently not being called anywhere. It is anticipated to be called in CallCardPresenter after the appropriate data is loaded. Bug: 23351559 Change-Id: Id72390fc9d2a8794b88ab72661381eb96596d619
2015-10-01PhoneStateListener & ContentObserver for blocked calls.Andrew Lee
Add a phone state listener to attempt to silence the ringer earlier. Add ContentObserver which watches the call log. There is an instance created for each blocked calls. It will watch the call log for changes pertaining to a set of blocked numbers/times it keeps track of. If there is a call log entry which matches with that number and time, mark it as blocked. Bug: 24341350 Bug: 23944005 Change-Id: I5c40f722d777355140bf98f897d208bd0330e09c
2015-09-28Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Iac4d5e4203c3c81bc414dacc8b452de9e80f61c3 Auto-generated-cl: translation import
2015-09-29am f091241e: If call is blocked, log something.Anne Rong
* commit 'f091241e88fb19979019bd69e0dd1f2df58ce01b': If call is blocked, log something.
2015-09-28If call is blocked, log something.Anne Rong
Bug: 24414759 Change-Id: I8f263aac6164375f5b3d77411c95192aeb9bec5f
2015-09-28am a1b02ffc: Merge "Use TransactionSafeActivity" into ub-contactsdialer-a-devJay Shrauner
* commit 'a1b02ffc64ce7bb376cb9045ff9e93fd7f2b6571': Use TransactionSafeActivity
2015-09-28Merge "Use TransactionSafeActivity" into ub-contactsdialer-a-devJay Shrauner
2015-09-28am 9d83dead: Merge "UI for InCall context for outgoing calls to a business." ↵Nancy Chen
into ub-contactsdialer-a-dev * commit '9d83deada6b84cbdfb19925c1ce490dbf3c752f0': UI for InCall context for outgoing calls to a business.
2015-09-28Merge "UI for InCall context for outgoing calls to a business." into ↵Nancy Chen
ub-contactsdialer-a-dev
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 22:47:53 +0000