10ae593a59aa50963e1d3159747da2d65ca79bed |
|
04-Aug-2017 |
Eric Erfanian <erfanian@google.com> |
This change brings Dialer oc-mr1-dev up to date with v11.1 RC06. This is to resolve a merge conflict in: I48296c56fb1d275a06b7c314f5380266c1195ef2 Test: make master is already up to date and Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9 Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
/packages/apps/Dialer/java/com/android/dialer/notification/VoicemailChannelUtils.java
|
5b4becb8ca9cc6249d0cf0a074bf63d6999f3b5e |
|
20-Jun-2017 |
wangqi <wangqi@google.com> |
Automated g4 rollback of changelist 158923709. *** Reason for rollback *** It's not necessary anymore after we verified it could be controlled from server side. *** Original change description *** Flip flag to enable ReturnToCall bubble. Enables ReturnToCall bubble and changes the name of the flag so that it can be toggled independently from previous versions. *** Also in the change: Restore TODOs Test: TH PiperOrigin-RevId: 159587541 Change-Id: I88f01550f07a7859f41b4f0fc843e92b38f5a85b
/packages/apps/Dialer/java/com/android/dialer/notification/VoicemailChannelUtils.java
|
2f1c7586bcce334ca69022eb8dc6d8965ceb6a05 |
|
19-Jun-2017 |
Eric Erfanian <erfanian@google.com> |
Update AOSP Dialer source from internal google3 repository at cl/159428781. Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/152373142 (4/06/2017) to cl/159428781 (6/19/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030
/packages/apps/Dialer/java/com/android/dialer/notification/VoicemailChannelUtils.java
|