summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* am 0adb6c0a: am 07a15fd5: am 53fb3f04: Merge "Add strings for visual ↵Nancy Chen2015-06-111-0/+11
|\ | | | | | | | | | | | | voicemail promo card." into mnc-dev * commit '0adb6c0a67c52b4620795141192a15b33fb62950': Add strings for visual voicemail promo card.
| * am 53fb3f04: Merge "Add strings for visual voicemail promo card." into mnc-devNancy Chen2015-06-111-0/+11
| |\ | | | | | | | | | | | | * commit '53fb3f0481986c15d6b3d5f608e7f02d8f4482d6': Add strings for visual voicemail promo card.
| | * Merge "Add strings for visual voicemail promo card." into mnc-devNancy Chen2015-06-111-0/+11
| | |\
| | | * Add strings for visual voicemail promo card.Nancy Chen2015-06-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Promo card coming, but wanted to get strings in before strings deadline. Bug: 21086059 Change-Id: I60455bfdb6fa268898312cb6aa2a2cb8f567a9d6
| | | * Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-06-0977-217/+208
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e6f7928823e08a51cf66aa19c46deb9c669b8c7f. Change-Id: Ica1daa35acfdc8a635499970ca7f7b4d5bfb3a19
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-06-0977-208/+217
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie141ef5afb960f73c48af495a09a08d41877d14c Auto-generated-cl: translation import
* | | | am 3e56c1f7: am a7011485: am 80f36ae4: Some paranoid string changes.Andrew Lee2015-06-111-16/+40
|\| | | | | | | | | | | | | | | | | | | * commit '3e56c1f77ff403a3688e29b3b957bac67013e8e2': Some paranoid string changes.
| * | | am 80f36ae4: Some paranoid string changes.Andrew Lee2015-06-111-16/+40
| |\| | | | | | | | | | | | | | | | | | * commit '80f36ae4d4ebef28ae66f8fe9e092d342eeee796': Some paranoid string changes.
| | * | Some paranoid string changes.Andrew Lee2015-06-101-16/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And, deleted some unused strings. Bug: 21654755 Change-Id: I89fe9ac8caf121980d062583caa59bb45307e028
* | | | am 3e5dc186: am 5b1238df: am 73be4a04: Merge "Call log duration display for ↵Roshan Pius2015-06-101-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | calls less than a minute." into mnc-dev * commit '3e5dc18611eadc819df592d4875685e63c4b3065': Call log duration display for calls less than a minute.
| * | | am 73be4a04: Merge "Call log duration display for calls less than a minute." ↵Roshan Pius2015-06-101-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '73be4a0455e6ceb3757c24889f138a0cdc3d5840': Call log duration display for calls less than a minute.
| | * | Merge "Call log duration display for calls less than a minute." into mnc-devRoshan Pius2015-06-101-0/+3
| | |\ \
| | | * | Call log duration display for calls less than a minute.Roshan Pius2015-06-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the call log details duration display to show only the seconds if the elapsed duration is less than a minute. Bug: 19383401 Change-Id: I8d39ca2c6c680e58602022250d4272d83024696d
* | | | | am 1dd730cf: am e7e65a20: am 93f6a328: Merge "Update string reference." into ↵Andrew Lee2015-06-101-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '1dd730cf06b38304e3aa8ddaf29a2c71650d0252': Update string reference.
| * | | | am 93f6a328: Merge "Update string reference." into mnc-devAndrew Lee2015-06-101-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '93f6a328dfd84a4d7ac4c18b80749cc8af914d51': Update string reference.
| | * | | Update string reference.Andrew Lee2015-06-101-1/+1
| | | |/ | | |/| | | | | | | | | | | | | Bug: 21715448 Change-Id: I809081ae80bfb15a3d95eb976715b1cc786a2b94
| | * | Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-06-0877-343/+208
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 06202b5c1c9d0c658c298646e95185e7763143b0. Change-Id: I35a6e77a9cd276d2cb0359bacaa298619f9a3d01
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-208/+343
| | | | | | | | | | | | | | | | | | | | Change-Id: I91f9105027611774ffbd0b6c443861883b16c443 Auto-generated-cl: translation import
* | | | Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-06-0977-217/+208
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ba5e9508fba213fd45b481337ee86a0eced2f24b. Change-Id: Iea2d4fd6e50aa97b0dfab9981d19f97caab8eb0a
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0977-208/+217
| | | | | | | | | | | | | | | | | | | | Change-Id: Idb2b187cbf1560e4c73d0140ed30adffb128202f Auto-generated-cl: translation import
* | | | Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-06-0877-343/+208
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5f163ffd23ba50049605ac8c01000f19f42b3e9f. Change-Id: Idbee40559bb29e554fe0ec6a561fe68af3be8534
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-208/+343
| | | | | | | | | | | | | | | | | | | | Change-Id: I27fa97b5834506864432eb215c96779e781152c7 Auto-generated-cl: translation import
* | | | am 334e0674: am 9f5f329c: am 6406d98f: Merge "Add call button to details, ↵Andrew Lee2015-06-069-80/+89
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | increase hit area." into mnc-dev * commit '334e06741d54167c6c445f379f9317f914851594': Add call button to details, increase hit area.
| * | | am 6406d98f: Merge "Add call button to details, increase hit area." into mnc-devAndrew Lee2015-06-069-80/+89
| |\| | | | | | | | | | | | | | | | | | * commit '6406d98f10d6e74492e7cc47bd6f5c6c5fbb6fdf': Add call button to details, increase hit area.
| | * | Merge "Add call button to details, increase hit area." into mnc-devAndrew Lee2015-06-059-80/+89
| | |\ \
| | | * | Add call button to details, increase hit area.Andrew Lee2015-06-059-80/+89
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Add call back button in call details. + Increase touch target size of call back button. + Simplify tint styling and layouts. - Delete asset which was duplicate of one in ContactsCommon. Bug: 18331084 Bug: 21659613 Change-Id: Icbd5f66a294f1215dc2056e7f7aece2129af5630
* | | | am 8cddbb0c: am 1c43e9a3: am 3ba851c3: Merge "Add delete action to voicemail ↵Andrew Lee2015-06-069-46/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | in call log." into mnc-dev * commit '8cddbb0c776d5bdd4e95aa07aacd38c522c0a417': Add delete action to voicemail in call log.
| * | | am 3ba851c3: Merge "Add delete action to voicemail in call log." into mnc-devAndrew Lee2015-06-069-46/+26
| |\| | | | | | | | | | | | | | | | | | * commit '3ba851c3df0429bb4c5a0a376ea669f8ea5be9e0': Add delete action to voicemail in call log.
| | * | Merge "Add delete action to voicemail in call log." into mnc-devAndrew Lee2015-06-059-46/+26
| | |\ \
| | | * | Add delete action to voicemail in call log.Andrew Lee2015-06-059-46/+26
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | + Cleanup some asset and variable naming. Bug: 21239168 Change-Id: I4c99484bee1fcd300857cf44080c38e19a98cb5a
* | | | am 9b544445: am 414067cf: am 24084af3: Merge changes Id1c7d48f,Ib903d19c ↵Andrew Lee2015-06-061-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '9b544445628b56a6c3c70dcac83985988a77597e': Show empty view after load returns empty. Change text to "add to a contact".
| * | | am 24084af3: Merge changes Id1c7d48f,Ib903d19c into mnc-devAndrew Lee2015-06-051-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | * commit '24084af3b3b6906872c843b706e93e7c48d5345e': Show empty view after load returns empty. Change text to "add to a contact".
| | * | Change text to "add to a contact".Andrew Lee2015-06-051-2/+2
| | |/ | | | | | | | | | | | | Bug: 21550993 Change-Id: Ib903d19c589709a414ef475c8450843054f81375
* | | am c2f93e80: am 99567d89: am feddb49c: Merge "Fix shortcut action text ↵Andrew Lee2015-06-051-5/+5
|\| | | | | | | | | | | | | | | | | | | | length issues." into mnc-dev * commit 'c2f93e80fd358b274795b79e482c63d12044da00': Fix shortcut action text length issues.
| * | am feddb49c: Merge "Fix shortcut action text length issues." into mnc-devAndrew Lee2015-06-051-5/+5
| |\| | | | | | | | | | | | | * commit 'feddb49ced2eb10328f9f3db52c950668472ffef': Fix shortcut action text length issues.
| | * Merge "Fix shortcut action text length issues." into mnc-devAndrew Lee2015-06-051-5/+5
| | |\
| | | * Fix shortcut action text length issues.Andrew Lee2015-06-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Lower shortcut char limits. There's probably 40 characters of space on a N6, but less on smaller devices. + Shorten "Add to existing contact" to "add to contact". Bug: 21550993 Change-Id: I136b01cd90ae36e07b7f567294e68316a57856a0
* | | | am 39e0f334: am d7a18b77: am 16249d19: Merge "Move VM playback from details ↵Andrew Lee2015-06-043-20/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | to call log." into mnc-dev * commit '39e0f334633aca3daf1794e0c9ce709021410d22': Move VM playback from details to call log.
| * | | am 16249d19: Merge "Move VM playback from details to call log." into mnc-devAndrew Lee2015-06-043-20/+5
| |\| | | | | | | | | | | | | | | | | | * commit '16249d19754ae21bc31b1187dc42e51d86bdbff6': Move VM playback from details to call log.
| | * | Merge "Move VM playback from details to call log." into mnc-devAndrew Lee2015-06-043-20/+5
| | |\ \ | | | |/ | | |/|
| | | * Move VM playback from details to call log.Andrew Lee2015-06-033-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Delete voicemail playback in the CallDetailActivity. + Add voicemail playback to the call log list items. + Move the VoicemailPlaybackPresenter to the CallLogFragment. + Fix some retaining state for both call log (expanded items), and preserve rotation/state functionality for voicemail playback. This included some changes to the Presenter logic. + Fix some tests. Bug: 21471763 Bug: 21170557 Change-Id: I30aae3a52c5bbf74a5075a9666343c337b1fc0df
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-06-0320-43/+43
| | |/ | | | | | | | | | | | | Change-Id: I9395c300cd4cfc041bd2fc10d720d6782e704e45 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEGeoff Mendal2015-06-011-3/+3
| | | | | | | | | | | | | | | Change-Id: Iaf5c16a5295cb7e172d640dfc350fb952a2a5900 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEGeoff Mendal2015-05-292-42/+107
| | | | | | | | | | | | | | | Change-Id: Iac064f2404ce5962bc6a4d49106d8f0ab790741f Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0320-43/+43
| | | | | | | | | | | | | | | Change-Id: Ib1c93cb9276cb1098e2748081b45a0d5e82b30da Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-06-011-3/+3
| | | | | | | | | | | | | | | Change-Id: I204e3340d35959b63c9bb6c20ce177112d3752ce Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-05-292-42/+107
| | | | | | | | | | | | | | | Change-Id: Ieb9313ef81e94b587e20278c7c38d75f1fe6ef3a Auto-generated-cl: translation import
* | | am ff683f9f: am 28b6e6d3: am 6c327dcc: Merge "Refactor Voicemail Playback ↵Andrew Lee2015-05-281-0/+6
|\| | | | | | | | | | | | | | | | | | | | into standalone view." into mnc-dev * commit 'ff683f9fe09ce6e8df93e27e6923ddcb135473ac': Refactor Voicemail Playback into standalone view.
| * | am 6c327dcc: Merge "Refactor Voicemail Playback into standalone view." into ↵Andrew Lee2015-05-281-0/+6
| |\| | | | | | | | | | | | | | | | | | | mnc-dev * commit '6c327dcc027c6df1548873031d62a0d84a0dc50d': Refactor Voicemail Playback into standalone view.
| | * Merge "Refactor Voicemail Playback into standalone view." into mnc-devAndrew Lee2015-05-281-0/+6
| | |\