summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2016-08-18Import translations. DO NOT MERGEBill Yi
Change-Id: I22605f233a9310f43e31c6ea0166cc16525005b0 Auto-generated-cl: translation import
2016-08-11Import translations. DO NOT MERGE am: 599bb2dbe7 -s oursBill Yi
am: ad5c1b256a -s ours Change-Id: Ib1b32ebe070408a9c676581154bb9a8da429ee50
2016-08-11Import translations. DO NOT MERGEBill Yi
am: 049e9def67 -s ours Change-Id: I9b7f7d61166a24069a85d831547d9cb89870492b
2016-08-11Import translations. DO NOT MERGEBill Yi
am: 599bb2dbe7 -s ours Change-Id: Ie5f70eb5cf1e88d8871ccbaa9312ddf7a60b11eb
2016-08-09Import translations. DO NOT MERGE am: 76ba37f81e -s ours am: 8189f1ff66 -s ↵Bill Yi
ours am: df93c5b7c6 -s ours am: 461e8ec49c -s ours am: cb222f5406 -s ours am: 15eb6049a6 -s ours am: f66d490d17 -s ours am: 2572798891 -s ours Change-Id: I4f69a275aa4c2328d486a79ac1bcc133703bfa63
2016-08-09Import translations. DO NOT MERGE am: 76ba37f81e -s ours am: 8189f1ff66 -s ↵Bill Yi
ours am: df93c5b7c6 -s ours am: 461e8ec49c -s ours am: cb222f5406 -s ours am: c381f60aa1 -s ours am: 2384b09d7e -s ours Change-Id: I1f55003de9e2b7af28cba5a5dd6011a016e8de62
2016-08-09Import translations. DO NOT MERGE am: 76ba37f81e -s ours am: 8189f1ff66 -s ↵Bill Yi
ours am: df93c5b7c6 -s ours am: 461e8ec49c -s ours am: cb222f5406 -s ours am: 15eb6049a6 -s ours am: f66d490d17 -s ours Change-Id: I485778c4c2640279e480251f7811230e1b1f0cf7
2016-08-09Import translations. DO NOT MERGE am: 76ba37f81e -s ours am: 8189f1ff66 -s ↵Bill Yi
ours am: df93c5b7c6 -s ours am: 461e8ec49c -s ours am: cb222f5406 -s ours am: c381f60aa1 -s ours Change-Id: Ie04e26b0e0c7a304a2b29ad81f750bb881c4b15c
2016-08-09Import translations. DO NOT MERGE am: 9067a591c6 -s ours am: db8d7374ff -s ↵Bill Yi
ours am: 1efd118e88 -s ours am: 71e9facb9a -s ours am: 6df16ad6aa -s ours am: 9b97345002 -s ours am: 76230364e9 -s ours Change-Id: Ib871f8c6c218636ed926d0a4e05e6beeb00e3670
2016-08-09Import translations. DO NOT MERGE am: 76ba37f81e -s ours am: 8189f1ff66 -s ↵Bill Yi
ours am: df93c5b7c6 -s ours am: 461e8ec49c -s ours am: cb222f5406 -s ours am: 15eb6049a6 -s ours Change-Id: I6315d7c1bc92b3ac43d2bb28d7618df10bc40f9f
2016-08-09Import translations. DO NOT MERGE am: 9067a591c6 -s ours am: db8d7374ff -s ↵Bill Yi
ours am: 1efd118e88 -s ours am: 71e9facb9a -s ours am: 6df16ad6aa -s ours am: 9b97345002 -s ours Change-Id: Ic9eecddb78a3cbce0823c87b3fc7f1ad7cbd8408
2016-08-09Import translations. DO NOT MERGE am: 76ba37f81e -s ours am: 8189f1ff66 -s ↵Bill Yi
ours am: df93c5b7c6 -s ours am: 461e8ec49c -s ours am: cb222f5406 -s ours Change-Id: I76e9a68dc769d59557d00bb5cd0b63115effe5d8
2016-08-09Import translations. DO NOT MERGE am: 9067a591c6 -s ours am: db8d7374ff -s ↵Bill Yi
ours am: 1efd118e88 -s ours am: 71e9facb9a -s ours am: 33e39fea4c -s ours am: 8ced1f477e -s ours Change-Id: I7babd9bc0cc9b49460f3b664038b0991d0e2e005
2016-08-09Import translations. DO NOT MERGE am: 76ba37f81e -s ours am: 8189f1ff66 -s ↵Bill Yi
ours am: df93c5b7c6 -s ours am: 461e8ec49c -s ours am: cb222f5406 -s ours Change-Id: I4cf203cce451c20e705e52d25ea6d6dd6e53bfa2
2016-08-09Import translations. DO NOT MERGE am: c3b4372304 -s ours am: b65107105e -s ↵Bill Yi
ours am: 805fd29729 -s ours am: 5f328879c2 -s ours Change-Id: I26f0a1507677c8db4ef609a719f1a84e4d2c351d
2016-08-09Import translations. DO NOT MERGE am: c3b4372304 -s ours am: b65107105e -s ↵Bill Yi
ours am: a5faf487d8 -s ours am: dbdc6b9cff -s ours am: 6db6b090c5 -s ours Change-Id: I17c2acd636b9824ba4417e27cf08096d8e783156
2016-08-09Import translations. DO NOT MERGE am: 9067a591c6 -s ours am: db8d7374ff -s ↵Bill Yi
ours am: 1efd118e88 -s ours am: 71e9facb9a -s ours am: 33e39fea4c -s ours Change-Id: I45d2afed378a01c6ffc9a503947bb0d73ed3d3bd
2016-08-09Import translations. DO NOT MERGE am: c3b4372304 -s ours am: b65107105e -s ↵Bill Yi
ours am: 805fd29729 -s ours Change-Id: I00d0762f91852ddf73f19d76be51a424d41a3a79
2016-08-09Import translations. DO NOT MERGE am: 76ba37f81e -s ours am: 8189f1ff66 -s ↵Bill Yi
ours am: df93c5b7c6 -s ours am: 461e8ec49c -s ours Change-Id: I15cfc65f81bab6dd63cc70fb8c5fa58e9f8dcf97
2016-08-09Import translations. DO NOT MERGE am: 9067a591c6 -s ours am: db8d7374ff -s ↵Bill Yi
ours am: 1efd118e88 -s ours am: 71e9facb9a -s ours am: 6df16ad6aa -s ours Change-Id: I3b0e7cc92ea76b0d6114a039dbdb1cb78b57ec4f
2016-08-09Import translations. DO NOT MERGE am: c3b4372304 -s ours am: b65107105e -s ↵Bill Yi
ours am: a5faf487d8 -s ours am: dbdc6b9cff -s ours Change-Id: I0d7b66411e71a705b9c68a277b1bc542033df657
2016-08-09Import translations. DO NOT MERGE am: 9067a591c6 -s ours am: db8d7374ff -s ↵Bill Yi
ours am: 1efd118e88 -s ours am: 71e9facb9a -s ours Change-Id: I6c4d909193c6e6ce52b942986acc2c77722efa4a
2016-08-09Import translations. DO NOT MERGE am: c3b4372304 -s oursBill Yi
am: b65107105e -s ours Change-Id: I9a88538d32502d3947c78048830256d50c22c059
2016-08-09Import translations. DO NOT MERGE am: 9067a591c6 -s ours am: db8d7374ff -s ↵Bill Yi
ours am: 1efd118e88 -s ours am: 71e9facb9a -s ours Change-Id: I18a740573a653e679324134e5173454023a60fab
2016-08-09Import translations. DO NOT MERGE am: c3b4372304 -s ours am: b65107105e -s ↵Bill Yi
ours am: a5faf487d8 -s ours Change-Id: I3f8bf99c6073269db3ee28c3f332eacc55681bb0
2016-08-09Import translations. DO NOT MERGE am: 76ba37f81e -s ours am: 8189f1ff66 -s ↵Bill Yi
ours am: df93c5b7c6 -s ours Change-Id: Iaab18873b205a81ff243903981afbd108cf55f6e
2016-08-09Import translations. DO NOT MERGE am: 717de1098c -s ours am: d171aaeb20 -s ↵Bill Yi
ours am: 14dba131cc -s ours am: 2e4b6da14b -s ours Change-Id: I9a50d186fa5dbb8e67c844299b2257f02f52820e
2016-08-09Merge "Import translations. DO NOT MERGE am: 717de1098c -s ours am: ↵Bill Yi
0d513ac8af -s ours" into nyc-mr1-dev-plus-aosp am: 37b43108d9 -s ours Change-Id: I7a28e15560f86b5c92d4c80e1c113c080b894511
2016-08-09Import translations. DO NOT MERGE am: 717de1098c -s ours am: 0d513ac8af -s ↵Bill Yi
ours am: 5740be6b60 -s ours Change-Id: I3bb3e25a02e2dfce9f3e0a97588990b4f9af4c8b
2016-08-09Import translations. DO NOT MERGE am: 9bd16ea906 -s ours am: e0568aa32c -s ↵Bill Yi
ours am: c3f976b025 -s ours Change-Id: If9aba664a73b70910f63dac82e2531dda7bf3783
2016-08-09Import translations. DO NOT MERGE am: 9067a591c6 -s ours am: db8d7374ff -s ↵Bill Yi
ours am: 1efd118e88 -s ours Change-Id: I56ddcdb3e39ee53bd0c907d2f8641ebd3662bc49
2016-08-09Import translations. DO NOT MERGE am: c3b4372304 -s oursBill Yi
am: b65107105e -s ours Change-Id: Iba81a9a545c2f960f3babc45f5404380caf87247
2016-08-09Import translations. DO NOT MERGE am: 9067a591c6 -s oursBill Yi
am: db8d7374ff -s ours Change-Id: I807de426a9d776526d251c7c678483733edb406b
2016-08-09Import translations. DO NOT MERGE am: 76ba37f81e -s oursBill Yi
am: 8189f1ff66 -s ours Change-Id: I0e9fb6fb8083b0102e910db799e839132556893e
2016-08-09Import translations. DO NOT MERGE am: 717de1098c -s ours am: d171aaeb20 -s ↵Bill Yi
ours am: 14dba131cc -s ours Change-Id: Iee414c6cd8d38bb51757f03f7536f900a94f4e12
2016-08-09Merge "Import translations. DO NOT MERGE am: 717de1098c -s ours am: ↵Android Build Merger (Role)
0d513ac8af -s ours" into nyc-mr1-dev-plus-aosp
2016-08-09Import translations. DO NOT MERGE am: 717de1098c -s oursBill Yi
am: 0d513ac8af -s ours Change-Id: I2ce3f6f025b89ef5a35ba5a1132c6a08b523038b
2016-08-09Import translations. DO NOT MERGEBill Yi
am: c3b4372304 -s ours Change-Id: I8b8c897698bb5077bd44bb7327f2bce7823b74cc
2016-08-09Import translations. DO NOT MERGEBill Yi
am: 9067a591c6 -s ours Change-Id: I2994e9cc0ef04e1f566e5bad144269ec65849ccd
2016-08-09Import translations. DO NOT MERGEBill Yi
am: 76ba37f81e -s ours Change-Id: I4f107915ec3a538b01d3176ca56b924ae3f291a0
2016-08-09Import translations. DO NOT MERGE am: 9bd16ea906 -s oursBill Yi
am: e0568aa32c -s ours Change-Id: Ia7e06528585bb0d349497545388a401143097e09
2016-08-09Import translations. DO NOT MERGE am: 717de1098c -s oursBill Yi
am: d171aaeb20 -s ours Change-Id: I53ac1c76c56e3cd32bdb2814c439975cd9368a1f
2016-08-09Import translations. DO NOT MERGEBill Yi
am: 717de1098c -s ours Change-Id: I8e5456283e0ee66b768aeb664b876b2aceb8ff0b
2016-08-09Import translations. DO NOT MERGEBill Yi
am: 9bd16ea906 -s ours Change-Id: Iabbb1baf4c4c735e1bd573f02264f7514fad32ff
2016-08-09Import translations. DO NOT MERGEBill Yi
am: 717de1098c -s ours Change-Id: Id6dd1dcd78c675cc6225e6059e49661449632642
2016-08-09Import translations. DO NOT MERGEBill Yi
Change-Id: I85eb6a46665b8c76e04dc9c93a89d485f874006f Auto-generated-cl: translation import
2016-08-09Import translations. DO NOT MERGEBill Yi
Change-Id: I91cfdf45c1efdd079daad86ba10650196f8a19c0 Auto-generated-cl: translation import
2016-08-09Import translations. DO NOT MERGEBill Yi
Change-Id: I0a8a5cd160c854c60e058c1ebcac63764fc7ee1e Auto-generated-cl: translation import