summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-10Rename language+country resources to just languageRoozbeh Pournader
Bug: 26496609 Test: none Change-Id: Ic8ab6603b6eeafc8eab3f0a7a3dc374119a17d64
2017-01-10Merge "Fixed a typo" am: 42187acc7b am: b54f70ba5e am: 120b6ef8ebalazar
am: 2c0f8284ce Change-Id: I80458edc11a4d2833304898fa2dab413cab8d6bc
2017-01-10Merge "Fixed a typo" am: 42187acc7b am: b54f70ba5ealazar
am: 120b6ef8eb Change-Id: Ic3fcdb8fe92bd4f8785d2446541cf6ca470cdf22
2017-01-10Merge "Fixed a typo" am: 42187acc7balazar
am: b54f70ba5e Change-Id: I3f94588ac1cb98e729705dea6abdc24d1113b47d
2017-01-10Merge "Fixed a typo"alazar
am: 42187acc7b Change-Id: I595820f5cd3eba53cf00b822fa23f92b2ed26900
2017-01-10Merge "Fixed a typo"Treehugger Robot
2017-01-09Fixed a typoalazar
Fixed two typos in the comment section Change-Id: If48c628648c388e5c2906b2922e1a2d514d9576a Signed-off-by: alazar <alshenkute@gmail.com>
2017-01-09Import translations. DO NOT MERGEBill Yi
Change-Id: Ibabe7757aa0292b5de9a8478ccaa971b58cbb379 Auto-generated-cl: translation import
2017-01-06Merge "Display incoming call when phone account selection dialog shows" am: ↵Wenlu Wu
fdf68fbd0b am: 2f06e83ade am: f6a3e26644 am: 8012f1a83f Change-Id: Ife7419f7c86aafe4a2a6a3656e257383b1f0c079
2017-01-06Merge "Display incoming call when phone account selection dialog shows" am: ↵Wenlu Wu
fdf68fbd0b am: 2f06e83ade am: f6a3e26644 Change-Id: I4e06aae3310b7f29d120daa3222f0d07c73b50b3
2017-01-06Merge "Display incoming call when phone account selection dialog shows" am: ↵Wenlu Wu
fdf68fbd0b am: 2f06e83ade Change-Id: I782d4bed3ad3150d0f5b4b87b687d923ca913e68
2017-01-06Merge "Display incoming call when phone account selection dialog shows"Wenlu Wu
am: fdf68fbd0b Change-Id: I0ea121445ef419e46da9a66ceba0c4673c49ca0e
2017-01-06Merge "Display incoming call when phone account selection dialog shows"Treehugger Robot
2017-01-05Merge "Fix conference call duration issue" am: c4a1ab0a73 am: 7fc24728cc am: ↵Narendra
8590508144 am: 3a4da507fd Change-Id: I346dae1f12e6b3ec9a68f89aaa1f782b31c81a7a
2017-01-05Merge "Fix conference call duration issue" am: c4a1ab0a73 am: 7fc24728ccNarendra
am: 8590508144 Change-Id: I29a6575bcf39b779021f9e3bb84297a951d74ac8
2017-01-05Merge "Fix conference call duration issue" am: c4a1ab0a73Narendra
am: 7fc24728cc Change-Id: I03e1afca96b26a9bd4f6f14f745d02aab99a3742
2017-01-05Merge "Fix conference call duration issue"Narendra
am: c4a1ab0a73 Change-Id: I562d6d4ff8fdfc40ab44f1d12f486f11e8c7170a
2017-01-05Merge "Fix conference call duration issue"Treehugger Robot
2017-01-05Import translations. DO NOT MERGEBill Yi
Change-Id: Iaad1d0e9fb6de3541735b4bb7e49728dde4484ae Auto-generated-cl: translation import
2017-01-03Fix conference call duration issueNarendra
The conf call start time is updated with a delay resulting in abnormal display of the conf call duration. Fixed by updating the duration only when the call start time is non-zero. Change-Id: I6a1b6c0ab0021d6e6e260bf1743487ec364366c4 Signed-off-by: Narendra <nagarw@codeaurora.org>
2016-12-30Import translations. DO NOT MERGEBill Yi
Change-Id: I3ce0d40976c702a0d980d541343b451548b3d0c0 Auto-generated-cl: translation import
2016-12-26Display incoming call when phone account selection dialog showsWenlu Wu
CallCardFragment is not created if there is an incoming call when phone account selection dialog shows, which results in incoming call not being shown. Fix issue by dismissing dialog and showing CallCardFragment in that case. Bug: 33893516 Change-Id: Icd7a729da974717945275cc5cec93da20864fde3
2016-12-21Import translations. DO NOT MERGEBill Yi
Change-Id: I8b33a8bd1872c8e3fa82b754996c95a90ae4f77d Auto-generated-cl: translation import
2016-12-19Fix casting issue in use of ICU Measures in DialerRoozbeh Pournader
Bug: 33670388 Bug: 33750033 Test: manual Change-Id: I5ed4fd9078ee5c976cda706e0ef73877928db2b1
2016-12-16Merge "Remove duration_hours etc and use ICU data"TreeHugger Robot
2016-12-15Remove duration_hours etc and use ICU dataRoozbeh Pournader
The ICU data is higher quality and supports a wider selection of locales. Also, previously spaces were used to separate the fields, which is not the correct separator in some locales. Bug: 33670388 Test: manual Change-Id: I99715dba63478a5bb319da041d1736ad247f2be1
2016-12-14Import translations. DO NOT MERGEBill Yi
Change-Id: Ie6491f95afc578ed1b5e87c634feb6a718090d05 Auto-generated-cl: translation import
2016-12-09Import translations. DO NOT MERGEBill Yi
Change-Id: If303f66f925f53b695287aa8a97b44deb2cd0ac6 Auto-generated-cl: translation import
2016-12-05Import translations. DO NOT MERGEBill Yi
Change-Id: Idd96b0a1c7dcb166918b73598131c5c3909066f9 Auto-generated-cl: translation import
2016-12-02Import translations. DO NOT MERGEBill Yi
Change-Id: Ie3d6c5882feca904e7968b50e0237b04ea165f0a Auto-generated-cl: translation import
2016-11-30Import translations. DO NOT MERGEBill Yi
Change-Id: Ie8bbf997862eb0f9d101f6cf73683c39cbeb0c3f Auto-generated-cl: translation import
2016-11-30Merge "Remove references to non-existant directories" am: 10ada2f2c2 am: ↵Colin Cross
b94019f32f am: 807a3a35d6 am: bc01a3edc3 Change-Id: I125d076cd22858b289e36e8b7a5e6ba367143e66
2016-11-30Merge "Remove references to non-existant directories" am: 10ada2f2c2 am: ↵Colin Cross
b94019f32f am: 807a3a35d6 Change-Id: I3bd412eecc570cee7977c6192227f3dd5bebe583
2016-11-30Merge "Remove references to non-existant directories" am: 10ada2f2c2Colin Cross
am: b94019f32f Change-Id: I1175d893b6dd7f91a63b2a706835f3fd84ab153d
2016-11-30Merge "Remove references to non-existant directories"Colin Cross
am: 10ada2f2c2 Change-Id: I98549ca9cbf3e5b371e9da29a52b9f19312ec122
2016-11-30Merge "Remove references to non-existant directories"Treehugger Robot
2016-11-29Remove references to non-existant directoriesColin Cross
Fixes warnings during makefile parsing: FindEmulator: find: `packages/apps/Dialer/InCallUI/src-N': No such file or directory FindEmulator: find: `packages/apps/PhoneCommon/src-N': No such file or directory Test: builds Change-Id: Idccbbb50a75ad953f8e5722c9803353dc3c9a714
2016-11-21Import translations. DO NOT MERGE am: 81ff98df9b -s ours am: dbcb1214fb -s ↵Bill Yi
ours am: 4c726b8f4f -s ours Change-Id: Ifea63dff5986cba2aec3cbd140cf95e2800f5163
2016-11-21Import translations. DO NOT MERGE am: 81ff98df9b -s oursBill Yi
am: dbcb1214fb -s ours Change-Id: I32857356a2fc8321fd1addf0e7d84d0ff7c9f1c1
2016-11-21Import translations. DO NOT MERGEBill Yi
am: 81ff98df9b -s ours Change-Id: I96b0e86acdeca499d547a385ff8c6043c74df722
2016-11-20Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 32177112 Change-Id: Ia4b95ecbae7c06c5a4a3cac2d4ad3210edae0903
2016-11-18Import translations. DO NOT MERGEBill Yi
Change-Id: Ie736bd97b6b6cea00d917b171b9a62e2dc3aee57 Auto-generated-cl: translation import
2016-11-09Import translations. DO NOT MERGEBill Yi
Change-Id: I1ba5244e4bddaeb172f70f1f1852875b743156be Auto-generated-cl: translation import
2016-11-07Import translations. DO NOT MERGEBill Yi
Change-Id: I2dfc8ad8408f40688802143cd9c807dc15bb9b82 Auto-generated-cl: translation import
2016-11-05Import translations. DO NOT MERGE am: 1b7051a709 -s oursBill Yi
am: 9a0278c50f -s ours Change-Id: I8db70179b3667f200a2ffe0eb27f095bb4c998c6
2016-11-05Import translations. DO NOT MERGEBill Yi
am: 1b7051a709 -s ours Change-Id: I297126d479fe2281d1df9fc21b1786e7766e427a
2016-11-04Import translations. DO NOT MERGEBill Yi
Change-Id: Iae524972b6f1d284825dffe667ab5366cf27c6e6 Auto-generated-cl: translation import
2016-10-26Import translations. DO NOT MERGEBill Yi
Change-Id: Ie7dcbb9a6fe21a5d761a55e72f9c4362af201a8f Auto-generated-cl: translation import
2016-10-25Merge "Fix OOM issue of InCallUI" am: d5e3de3253 am: f4744f532f am: 0265226b66sail
am: 6a77f5de83 Change-Id: I7c1c8beaee6ab563c20cc8ded7751b9c5d491692
2016-10-25Merge "Fix OOM issue of InCallUI" am: d5e3de3253 am: f4744f532fsail
am: 0265226b66 Change-Id: I494318261aa048881dcd07b98fb2374f95f5f55e
2016-10-25Merge "Fix OOM issue of InCallUI" am: d5e3de3253sail
am: f4744f532f Change-Id: I8074c8d06a4c5cb804f8f36ad3ca18846b4263fd
2016-10-25Merge "Fix OOM issue of InCallUI"sail
am: d5e3de3253 Change-Id: Ic1862e5944a9bdc01eea181011d13767f8a44978
2016-10-25Merge "Fix OOM issue of InCallUI"sail
2016-10-19Fix OOM issue of InCallUIWei Huang
CallButtonPresenter didn't remove itself from InCallPresenter(CanAddCallListener). Bug: 32266071 Change-Id: I2ad979d9eebeb110b03e5a1c103d7a4f98e317c0
2016-10-17Merge "Fixed Dial fab changed to add to contact when multiwindow mode" am: ↵sail
d1be0b9328 am: 4fb68ffaa1 am: cbe0b39ab3 Change-Id: I911ba292fd8bd9347dfe47b2681f91f0703d1252
2016-10-17Merge "Fixed Dial fab changed to add to contact when multiwindow mode" am: ↵sail
d1be0b9328 am: 4fb68ffaa1 Change-Id: I6f73b3e6a9b40a435276581db0f5376c1a0ca7b9
2016-10-17Merge "Fixed Dial fab changed to add to contact when multiwindow mode"sail
am: d1be0b9328 Change-Id: I758fb90c7dac1ae50abfe29578b818279687772a
2016-10-17Merge "Fixed Dial fab changed to add to contact when multiwindow mode"sail
2016-10-14Import translations. DO NOT MERGEBill Yi
Change-Id: Ie8f393f6275e73b733827e944f784896d0219c9d Auto-generated-cl: translation import
2016-10-11Fixed Dial fab changed to add to contact when multiwindow modeNaoki Amano
Added check whether DialtactActivity is in search mode or not. Change-Id: I621a9f6b2a419a3cfaa0f2e3e117b41143cdcce8
2016-10-03Import translations. DO NOT MERGEBill Yi
Change-Id: Id3ca40be136b537ece2ac6c4ea211707caeb2623 Auto-generated-cl: translation import
2016-09-30Import translations. DO NOT MERGEBill Yi
Change-Id: I617ce5aa996237c662d93e0b7f08d3d2f24f7851 Auto-generated-cl: translation import
2016-09-27Merge "Import translations. DO NOT MERGE"TreeHugger Robot
2016-09-27Merge "Fixing display option for KO, JA, ZH" into nyc-mr1-dev am: 9bdcff7bdf ↵Brandon Maxwell
am: e98b92a804 am: 40cd14f3e6 Change-Id: I9e6a556876a2ae485887b7b159329f582179a44a
2016-09-27Fixing display option for KO, JA, ZH am: 151b3ae6ad am: 11bdbcaeb4Brandon Maxwell
am: aef5e7f1d2 Change-Id: Id2d331432d296cc79f4ea3e5e2861c9712c75ec4
2016-09-27Fixing regression in AOSP CallDetails am: 7457ef708e am: 7f91cbaac9Brandon Maxwell
am: f6593a4e7b Change-Id: I7d5f8c1f72111a3d0067e3c286ee532262c724d1
2016-09-27Merge "Fixing display option for KO, JA, ZH" into nyc-mr1-dev am: 9bdcff7bdfBrandon Maxwell
am: e98b92a804 Change-Id: Ic5d4e87dc6811aae4d5347290110faeda2857eca
2016-09-27Fixing display option for KO, JA, ZH am: 151b3ae6adBrandon Maxwell
am: 11bdbcaeb4 Change-Id: I283d7c1c371143bcf59b7746d01cfa95a83668c9
2016-09-27Merge "Fixing display option for KO, JA, ZH" into nyc-mr1-devBrandon Maxwell
am: 9bdcff7bdf Change-Id: I5adb8fb17d4f00ac39d4ce3b78997af36556f20d
2016-09-27Fixing display option for KO, JA, ZHBrandon Maxwell
am: 151b3ae6ad Change-Id: I811b80ad4e97a0d9f4119f210aa447093172511d
2016-09-27Merge "Fixing display option for KO, JA, ZH" into nyc-mr1-devBrandon Maxwell
2016-09-27Fixing regression in AOSP CallDetails am: 7457ef708eBrandon Maxwell
am: 7f91cbaac9 Change-Id: I246e0dd20b9d69878f3c1c1ff97fc27519763dfc
2016-09-27Fixing regression in AOSP CallDetailsBrandon Maxwell
am: 7457ef708e Change-Id: Ic487cd5200d51dbe0fd4c37b90d473362a2d04b7
2016-09-26Fixing display option for KO, JA, ZHBrandon Maxwell
Names in Korean, Japanese, and Chinese are sorted and displayed by family name. Because of this, we shouldn't show the "Display Options" setting if the device is set for these locales. Other logic in the code will ignore the user set preferences anyway. Bug:30782253 Change-Id: I15ff7328609aea937940fc60c43e6f0c8dfdb5d2
2016-09-26Fixing regression in AOSP CallDetailsBrandon Maxwell
A regression was introduced which caused the back arrow in the AOSP CallDetailsActivity to not work properly. This CL merges an external contribution (http://pagit/626605) that fixes the issue by setting the parentActivityName appropriately. Bug:30004436 Change-Id: I238ff71f3f7e618d5adc972c50012b13f3753f40
2016-09-26Import translations. DO NOT MERGEBill Yi
Change-Id: I19ded27bb514a8445dbdf83aed437254d211f384 Auto-generated-cl: translation import
2016-09-21Import translations. DO NOT MERGEBill Yi
Change-Id: Ib4e6f6de000678151f96049e52dad1fc5a941db7 Auto-generated-cl: translation import
2016-09-17Import translations. DO NOT MERGE am: 94bc93006c -s ours am: 5b66abc878 -s ↵Bill Yi
ours am: 822d0f1c4e -s ours am: 88b38d12f8 -s ours Change-Id: I7fa419c1fe6361be5aa9de1a21234578a465a3b3
2016-09-17Import translations. DO NOT MERGE am: 94bc93006c -s ours am: 5b66abc878 -s ↵Bill Yi
ours am: 822d0f1c4e -s ours Change-Id: I184eb839913435f4e2743776649b113c946fc33c
2016-09-17Import translations. DO NOT MERGE am: 94bc93006c -s oursBill Yi
am: 5b66abc878 -s ours Change-Id: I488c18b5dc6cc9debe3eb952f0e382f161a4cecf
2016-09-17Import translations. DO NOT MERGEBill Yi
am: 94bc93006c -s ours Change-Id: I1ee37fd1b8860f9751c62773fe4d6fa314484da0
2016-09-16Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 31516661 Change-Id: Ibc524eacd95e5aef46008abf899f73427061ce39
2016-09-14[DO NOT MERGE] Fix block/unblock crash in call log history tab. am: ↵Sarmad Hashmi
90221588e1 am: 90c6a2c115 am: 6c4ab88491 -s ours Change-Id: Ib32b5d24aa0805d080b5a078a6d591d20c4951c9
2016-09-14[DO NOT MERGE] Fix block/unblock crash in call log history tab. am: 90221588e1Sarmad Hashmi
am: 90c6a2c115 Change-Id: I7afbe733b3c11eff68a6097ee589d8d8c87643d9
2016-09-14[DO NOT MERGE] Fix block/unblock crash in call log history tab.Sarmad Hashmi
am: 90221588e1 Change-Id: Ib5e83db37bd84e24be0786ea1e5d8403261acd3b
2016-09-12Import translations. DO NOT MERGEBill Yi
Change-Id: I425bf6f740ca014b35deef9ed34ec13f07d463d8 Auto-generated-cl: translation import
2016-09-09[DO NOT MERGE] Fix block/unblock crash in call log history tab.Sarmad Hashmi
+When long-pressing and then pressing block/unblock in call history tab, the dialer crashes +This is because in CallLogListItemViewHolder, the block/unblock dialog is shown, and after the user confirms, a snackbar is shown. The parent of this snackbar is a View with the id floating_action_button_container. The dialtacts_activity.xml has this but the call_log_activity.xml does not, causing the snackbar to have a null parent view. +Add floating_action_button_container to the call_log_activity.xml Fixes: 27976785 Fixes: 31361083 Change-Id: I5aa79093a21d7006e989c7ca0095bc7b25a261a5 (cherry picked from commit 167c6d1c3621f6be96952daaf0e8e7284bdae252)
2016-09-07Import translations. DO NOT MERGEBill Yi
Change-Id: I9ba58d4cec5e28ee7a57604cd4c052b398de01ad Auto-generated-cl: translation import
2016-09-01Merge "Import translations. DO NOT MERGE"TreeHugger Robot
2016-08-31Import translations. DO NOT MERGEBill Yi
Change-Id: Ic639ed9b603b9f963b72e9866ca867c6b790de06 Auto-generated-cl: translation import
2016-09-01[Cherry-pick] Use the correct handleMmi function am: a1e500b29a am: ↵Brandon Maxwell
05a8c8a318 am: f2d4bc9098 am: fc17ba8a41 am: c34b67a196 Change-Id: I57d43b5b39e977718c07f07da4c3df8b9e13ce38
2016-09-01[Cherry-pick] Use the correct handleMmi function am: a1e500b29a am: ↵Brandon Maxwell
05a8c8a318 am: f2d4bc9098 am: fc17ba8a41 Change-Id: I6e0e1b3b1870445aabbc6058fe14cb7b5a05ef4a
2016-09-01[Cherry-pick] Use the correct handleMmi function am: a1e500b29a am: bfb1cdc6ccBrandon Maxwell
am: b825046c97 Change-Id: I487b07a1bf1f87bc891de8b7e778bf7e7e14807f
2016-09-01[Cherry-pick] Use the correct handleMmi function am: a1e500b29a am: 05a8c8a318Brandon Maxwell
am: f2d4bc9098 Change-Id: Ifefb94babafa5ed947fb45a71625d49858278442
2016-09-01[Cherry-pick] Use the correct handleMmi function am: a1e500b29aBrandon Maxwell
am: 05a8c8a318 Change-Id: I4c274f2ace9ca5bf67c17f2b70ade42e06117eba
2016-09-01[Cherry-pick] Use the correct handleMmi function am: a1e500b29aBrandon Maxwell
am: bfb1cdc6cc Change-Id: I3cc44b1d742f48ee277233733f8a0616b79a4b62
2016-09-01[Cherry-pick] Use the correct handleMmi functionBrandon Maxwell
am: a1e500b29a Change-Id: I7d7ced10ae11b019841d0fe681a4ea53b45dce07
2016-09-01[Cherry-pick] Use the correct handleMmi functionBrandon Maxwell
am: a1e500b29a Change-Id: I1d14ccd54f1cdacc13eeccc775101740776d4622
2016-09-01[Cherry-pick] Use the correct handleMmi functionBrandon Maxwell
In the event that the PhoneAccountHandle is null, do not pass in null as the account handle, instead use the handleMmi string that only takes the dialString. This change seems to have taken place in http://ag/#/c/838273/11/src/com/android/dialer/util/TelecomUtil.java Fixing that with this CL Bug:31165762 Bug:29443147 Change-Id: Idc174639c48ab3c01ad5bde340272a8ec55d6ab1 (cherry picked from commit f9163d84e77a5287c16c679a946c3a8f934350d1)
2016-08-25Avoid JUnit4 collision in android-support-test, mockito-targetGuang Zhu
Bug: 31072145 Test: make droid checkbuild Change-Id: I257899fe815855d8cb9763693063b559d5038fb8