summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Dialer app changes for IMS"staging/cm-12.1Steve Kondik2015-03-294-243/+34
| | | | | | | | | * Get rid of the weird fab on the dialtacts activity, we do not currently need the IMS conference feature. This reverts commit b674c9f1db50d3075ef87732b7272b9a1ce8f281. Change-Id: I5eef0c71576aee957fb18c8a4641ebac76da3b92
* Give SIM spinner a little more width.Danny Baumann2015-03-261-1/+1
| | | | | | Current width isn't sufficient for e.g. German. Change-Id: I64427a23d4635d8c11ef92fd2b9b2dacfc8bd53e
* Fix merge relicts.staging/cm-12.1-testDanny Baumann2015-03-251-34/+0
| | | | Change-Id: I5a352640ba5704acd69382e53a15626cfd214487
* Fix parameter naming.Danny Baumann2015-03-251-4/+4
| | | | Change-Id: If5aa2c46f5c9fb78a058e073c00b6dd9fc3cf458
* Merge branch 'lollipop-mr1-release' of ↵Steve Kondik2015-03-25134-5372/+4360
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Dialer into cm-12.1 Change-Id: I594cec327dc6b576d765ba497fca0db6f91aa3ba
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-02-090-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-02-050-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-260-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-190-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-130-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-120-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-300-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-240-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-220-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-110-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-100-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-090-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-080-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-040-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Set content inset end to 0.Andrew Lee2014-12-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18593764 Change-Id: Ie1b29ae2515a7a9e2c9e8727c7e7a1ec1f6604e2
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-030-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-020-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-010-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-270-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-240-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-200-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-180-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * Move ToneGenerator recreation/release to onStart/onStopYorke Lee2014-11-171-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to do the costly ToneGenerator initialization inside onResume, which gets called during the Dialer -> InCallUI transition. Move it to onStart/onStop so it only happens when Dialer is actually in the background. Measurement of time taken for InCallActivity start -> onResumed, 10 runs Before: Average 541.9ms SD: 152.4ms After: Average 350.5ms SD: 81.1ms Bug: 18373617 Change-Id: I192e2bcc9fd4b7d423d804f333d8d32bff3f58c1
| | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |/|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99d00ab018325ebfa86206e847d48068065cdd9d
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6b0084dde5ae729584095cfe17bbc13eac6e5b7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e0499f20ca5b29bd09838f19bacff5ac9fd8e1e
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac0b6dfffe08e027eac03973f99fdcf50edb001f
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 272b84b3ef3d948ba1c9703b39525477d9d6f272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 272b84b3ef3d948ba1c9703b39525477d9d6f272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 272b84b3ef3d948ba1c9703b39525477d9d6f272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35741bb2f60cf438595950d08d078962e6cac3af
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8265c1eb4d2c3fc627cded0bbbee5ca5325b6b98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 076e9841dc30866e802ac9142fa2f9961bf536c7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5e1483618bbab3d44885c5a5956ff9bc063fff6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5e1483618bbab3d44885c5a5956ff9bc063fff6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1621a2f2d43a28b9a98b6e75bc1318d7e0c19a8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11d2c3b284d7e53d76af708be5fdab5bce01b4c0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 844b1532be89e413d2908ea8d26562028940fe6e
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 844b1532be89e413d2908ea8d26562028940fe6e
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 23:39:45 +0000