summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of f688fc95 to masterMark Wei2012-08-302-2/+5
|\ | | | | | | Change-Id: Ib4ade547d76faa4a730b75ea691c1cf1f99888cd
| * am da79838d: am a7e22413: Fix NullPointerException when tapping attachment.Mark Wei2012-08-302-2/+4
| |\ | | | | | | | | | | | | * commit 'da79838d619c3ae45a34ef45964c562331cf30da': Fix NullPointerException when tapping attachment.
| | * am a7e22413: Fix NullPointerException when tapping attachment.Mark Wei2012-08-302-2/+4
| | |\ | | | | | | | | | | | | | | | | * commit 'a7e22413eb860a1d9ffb46221c63e29ba7330ff5': Fix NullPointerException when tapping attachment.
| | | * Fix NullPointerException when tapping attachment.Mark Wei2012-08-302-2/+4
| | | | | | | | | | | | | | | | | | | | Bug: 7083179 Change-Id: I9955aeda9a0d2bb6d30ce9f7e7e3961cb47284e0
* | | | am 97992e59: am c645df0a: am 4f38cc16: Attachment image viewer should not ↵Mark Wei2012-08-292-3/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | scale images larger than original size. * commit '97992e595ffb8eef8a6a12609cc4da368d4e0f6f': Attachment image viewer should not scale images larger than original size.
| * | | am c645df0a: am 4f38cc16: Attachment image viewer should not scale images ↵Mark Wei2012-08-292-3/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | larger than original size. * commit 'c645df0a6d37dcf794e7ed8c8a334c08df8b9da6': Attachment image viewer should not scale images larger than original size.
| | * | am 4f38cc16: Attachment image viewer should not scale images larger than ↵Mark Wei2012-08-292-3/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | original size. * commit '4f38cc1673163848c7b843cb9d23b21945b0bf82': Attachment image viewer should not scale images larger than original size.
| | | * Attachment image viewer should not scale images larger than original size.Mark Wei2012-08-292-3/+10
| | | | | | | | | | | | | | | | | | | | Bug: 7049410 Change-Id: I1ed2555203e1541f1481cae4f17f532eaa57c1cd
* | | | am 4689c6f8: am 162052cc: am 114cef99: Fix crash in email with attachmentsPaul Westbrook2012-08-292-41/+38
|\| | | | | | | | | | | | | | | | | | | * commit '4689c6f834a99fe8b57f2391bc14d13a3c6645cb': Fix crash in email with attachments
| * | | am 162052cc: am 114cef99: Fix crash in email with attachmentsPaul Westbrook2012-08-292-41/+38
| |\| | | | | | | | | | | | | | | | | | * commit '162052ccf0501b267f47251595ab3d945880e7d2': Fix crash in email with attachments
| | * | am 114cef99: Fix crash in email with attachmentsPaul Westbrook2012-08-292-41/+38
| | |\| | | | | | | | | | | | | | | | | * commit '114cef99189d693ed9cd8cf778a60823d06d5298': Fix crash in email with attachments
| | | * Fix crash in email with attachmentsPaul Westbrook2012-08-282-41/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There isn't a need to call swapCursor in a runnable Bug: 7072747 Change-Id: I0a0a9b6835acc4a1d1748c94f4d8bec4551638b0
* | | | am de6ae4fa: am feffe9dd: am 26e3f68a: Deal with commas within quoted textmindyp2012-08-271-3/+16
|\| | | | | | | | | | | | | | | | | | | * commit 'de6ae4fa07fd8c1cf3d68c0ae6a5029f298ffef3': Deal with commas within quoted text
| * | | am feffe9dd: am 26e3f68a: Deal with commas within quoted textmindyp2012-08-271-3/+16
| |\| | | | | | | | | | | | | | | | | | * commit 'feffe9dd89757533ade5926afc284f9369c8a9c4': Deal with commas within quoted text
| | * | am 26e3f68a: Deal with commas within quoted textmindyp2012-08-271-3/+16
| | |\| | | | | | | | | | | | | | | | | * commit '26e3f68ae8342cedd57353e399e7d0e920228a4e': Deal with commas within quoted text
| | | * Deal with commas within quoted textmindyp2012-08-271-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is a comma within quoted text, it is NOT a chip ending token Fixes b/7001805 Names appended to email ids like "Mathew, Deepthi E" are split into two chips while replying Change-Id: I87f34a44282b3baf8d106dd21f8211ad301395be
* | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2e8d65682d5a198cb6e7c199c4f96369bc618ed9 Auto-generated-cl: translation import
* | | | am 90fc5310: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-220-0/+0
|\| | | | | | | | | | | | | | | * commit '90fc5310e57369e0b47b184cb18c2ec76afe6cca':
| * | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-220-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I4d3b9f6334bdccf63cbf10caaa83b84180c0ff20
| | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-220-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | Merge "Add HTTP uri handling & fetch thumbnail first"Adam Copp2012-08-224-175/+214
|\ \ \ \ \
| * | | | | Add HTTP uri handling & fetch thumbnail firstAdam Copp2012-08-224-175/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a http:// or https:// url is specified as the thumbnail uri or regular uri for an image, we attempt to fetch it over the internet. Also, changed the order of loading so that we always attempt to fetch the thumbnail image before we fetch the regular image. This aids in the http:// uri case, since it should take significantly less time to be presented with a thumbnail than the full image. Finally, finishes the photo viewer activity when the "top" button on the action bar is pressed, unless a custom override has been added. These 3 changes could be seperated into different patches if you would like Change-Id: Iddc8cc6bef3f9e66198dfb98eb2f7bd309023b3f
* | | | | | am b2b0fb50: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-210-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | * commit 'b2b0fb506442f721b5ce5b89feda418c1be23a39':
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-210-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: Ibba307bb9c4500e551fb4e7bb5e15c8f0ae1d683
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | |\ \ \ \
* | | | | | | | am ef1e8ba3: am 501d1bf0: am 3b321528: Abort posted runnable if cursor is no ↵Marc Blank2012-08-211-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | longer open * commit 'ef1e8ba35aaf56d81e25bf8042f4a332e34ef1f2': Abort posted runnable if cursor is no longer open
| * | | | | | | am 501d1bf0: am 3b321528: Abort posted runnable if cursor is no longer openMarc Blank2012-08-211-0/+4
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '501d1bf0f0488adcfe5ce03c3d98c567b57a41fd': Abort posted runnable if cursor is no longer open
| | * | | | | | am 3b321528: Abort posted runnable if cursor is no longer openMarc Blank2012-08-211-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | * commit '3b32152852917f08eb2f196db6454c083f7acd15': Abort posted runnable if cursor is no longer open
| | | * | | | Abort posted runnable if cursor is no longer openMarc Blank2012-08-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7002552 Change-Id: I38ce1231b0ec88ebf02d4d0edb5495b8baac65d5
* | | | | | | am 670c3df7: (-s ours) am edbaccd2: am 46e3466c: (-s ours) Import ↵Baligh Uddin2012-08-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '670c3df7980334ac61be895b2d0f2d7dff8c59ae': Import translations. DO NOT MERGE
| * | | | | | am edbaccd2: am 46e3466c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-08-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'edbaccd2ed8aa0d3efcdc6559faecc8dbe3c0b4c': Import translations. DO NOT MERGE
| | * | | | | am 46e3466c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-08-200-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46e3466c6912d54a55bde7ee0e227c495a4fe639': Import translations. DO NOT MERGE
| | | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbc0ec87eb8a3b07a380375df7ccd63fc5b258bb Auto-generated-cl: translation import
* | | | | | | am f1ac0f42: (-s ours) am 91ca68b9: Import translations. DO NOT MERGEBaligh Uddin2012-08-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1ac0f429611b19870c665d4ec4f1f93e5162c70': Import translations. DO NOT MERGE
| * | | | | | am 91ca68b9: Import translations. DO NOT MERGEBaligh Uddin2012-08-201-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91ca68b95392c5899859ce64f481276094ac686b': Import translations. DO NOT MERGE
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-201-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: I46586986f3e2adf4278d26f177c77d36f44c0c32 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c614369b21eebc77d1f107e07e96072a3fc9994 Auto-generated-cl: translation import
* | | | | | am c4fca47b: (-s ours) am 7a6016b4: am a7d8b798: (-s ours) Import ↵Baligh Uddin2012-08-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'c4fca47be9a95d7568c8a38e777bb7cf31986697': Import translations. DO NOT MERGE
| * | | | | am 7a6016b4: am a7d8b798: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-08-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a6016b4eafebd8f3baa49c92aeea913446d3fad': Import translations. DO NOT MERGE
| | * | | | am a7d8b798: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-08-170-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7d8b7982d22901f386d0f8de1077ba39787017b': Import translations. DO NOT MERGE
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2012-08-176-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b76b4206e7ceca5b8456ad19a540e1be3d58de8 Auto-generated-cl: translation import
* | | | | | am c5121aac: (-s ours) am eabadfe2: Import translations. DO NOT MERGEBaligh Uddin2012-08-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c5121aac635b9153c4f64a3f97fd6644e4a4439a': Import translations. DO NOT MERGE
| * | | | | am eabadfe2: Import translations. DO NOT MERGEBaligh Uddin2012-08-176-9/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eabadfe27954d1a91b54d6c9fc08d44e570cdfda': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-176-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie554b7c8f1730ae7402cbbcdb1bafec00348d835 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-176-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I488f9f595cd8585aa50d2f531118414325a2b989 Auto-generated-cl: translation import
* | | | | | am 857b75fd: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '857b75fd38cd16c02ac7f90abdc35dc1f5837693':
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: Icab08c2aee9de42a7735b22ea756cbcc9c89833c
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-160-0/+0
| | |\ \ \ \
* | | | | | | am 7ba0f66f: (-s ours) am 30cb80d9: Merge "Import translations. DO NOT ↵Baligh Uddin2012-08-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into jb-mr1-dev * commit '7ba0f66f95d3da7909ffff7f5c305f5a422cf6e8': Import translations. DO NOT MERGE
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 23:30:52 +0000