Commit Graph

13253 Commits

Author SHA1 Message Date
Tony Mantler
831bb0abfe am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit 'b043233486ab845291d76aa9878378cd1e3368b1':
  Match dup accounts against all accounts, not just Email
2014-11-02 17:27:54 +00:00
Anthony Lee
ca31da91c8 am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit '9d1dc78916b56d47a907a3ffa7fbd2375bb503a4':
  b/17135753. Make sure to free ServiceConnection.
2014-11-02 17:27:53 +00:00
Andrew Sapperstein
ecb6fc314f am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit '69dda4803ad5ddd1b436f84c9a29876f7baae097':
  Use appcompat photoviewer.
2014-11-02 17:27:52 +00:00
Tony Mantler
214cf5cf93 am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a
* commit 'e34c3677b429a935ac20443ae45136c49f62ca2f':
  Drawer resource updates
  Update Notifications (Email)
2014-11-02 17:27:51 +00:00
Tony Mantler
b043233486 Match dup accounts against all accounts, not just Email
automerge: c1a760b

* commit 'c1a760bf3609ee4d6bd7de0d78e1c6e2ffa151b1':
  Match dup accounts against all accounts, not just Email
2014-11-02 07:07:43 +00:00
Anthony Lee
9d1dc78916 b/17135753. Make sure to free ServiceConnection.
automerge: 8c65e50

* commit '8c65e50bfe3b90b96985c2d87b8c459c348af6aa':
  b/17135753. Make sure to free ServiceConnection.
2014-11-02 07:06:41 +00:00
Andrew Sapperstein
69dda4803a Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev
automerge: b042013

* commit 'b04201335cf33bded97e9019940e0b8f9ccfb6d9':
  Use appcompat photoviewer.
2014-11-02 07:06:06 +00:00
Tony Mantler
e34c3677b4 Merge "Drawer resource updates" into ub-gmail-ur14-dev
automerge: 1e6f26a

* commit '1e6f26af804d32e4780599481a6e11152756348f':
  Drawer resource updates
  Update Notifications (Email)
2014-11-02 07:04:54 +00:00
Baligh Uddin
3b78a31059 am 7fd70814: (-s ours) am 4b6f2e7a: (-s ours) Import translations. DO NOT MERGE
* commit '7fd7081491e46d8c0d78ab9bc9822e801a1d450e':
  Import translations. DO NOT MERGE
2014-10-20 00:34:46 +00:00
Baligh Uddin
7fd7081491 am 4b6f2e7a: (-s ours) Import translations. DO NOT MERGE
* commit '4b6f2e7a38c83c9bfa368c8aedef1cb5d91b7c8b':
  Import translations. DO NOT MERGE
2014-10-20 00:29:56 +00:00
Baligh Uddin
4b6f2e7a38 Import translations. DO NOT MERGE
Change-Id: I7dccf29ecb1954edcaf288ff4467e6aee2d29c15
Auto-generated-cl: translation import
2014-10-19 16:11:30 -07:00
Baligh Uddin
b83335b70a am 74abc876: (-s ours) am bf868306: (-s ours) Import translations. DO NOT MERGE
* commit '74abc876749aa9bfa0b56920af103eb5becc4bbd':
  Import translations. DO NOT MERGE
2014-09-29 21:00:55 +00:00
Baligh Uddin
74abc87674 am bf868306: (-s ours) Import translations. DO NOT MERGE
* commit 'bf8683067bbffefa2fe4eb2b00811dcab41c693b':
  Import translations. DO NOT MERGE
2014-09-29 20:47:19 +00:00
Baligh Uddin
bf8683067b Import translations. DO NOT MERGE
Change-Id: Ifec0071ffe7e247f0fc4f0fecdef145713949382
Auto-generated-cl: translation import
2014-09-28 19:49:26 -07:00
Baligh Uddin
845b3b143c am 11e6451d: (-s ours) am 611475df: (-s ours) Import translations. DO NOT MERGE
* commit '11e6451da317c0090be430b683218213cd17471c':
  Import translations. DO NOT MERGE
2014-09-15 04:49:13 +00:00
Baligh Uddin
11e6451da3 am 611475df: (-s ours) Import translations. DO NOT MERGE
* commit '611475df609bbbd9c515313658ba41ceaa20047b':
  Import translations. DO NOT MERGE
2014-09-15 02:53:59 +00:00
Baligh Uddin
611475df60 Import translations. DO NOT MERGE
Change-Id: Iafae6db0a11334dea0250f45ca01649db03902e4
Auto-generated-cl: translation import
2014-09-14 18:42:37 -07:00
Baligh Uddin
7ae823dc59 am b11eaa10: (-s ours) am 16ce4097: (-s ours) Import translations. DO NOT MERGE
* commit 'b11eaa104540564ad4e630f85edad72fdb5feb76':
  Import translations. DO NOT MERGE
2014-09-12 15:07:47 +00:00
Baligh Uddin
d5808a8c2b am da060300: (-s ours) Import translations. DO NOT MERGE
* commit 'da0603004d4fbdb4faa0b523ec43fca0c970bec8':
  Import translations. DO NOT MERGE
2014-09-12 15:07:46 +00:00
Baligh Uddin
b11eaa1045 am 16ce4097: (-s ours) Import translations. DO NOT MERGE
* commit '16ce409730a82666ef53303884e56b39fd0c6332':
  Import translations. DO NOT MERGE
2014-09-11 16:02:41 +00:00
Baligh Uddin
da0603004d Import translations. DO NOT MERGE
Change-Id: I13641ad92db6cfe7437cce06c16daae99bb00218
Auto-generated-cl: translation import
2014-09-08 10:31:49 -07:00
Baligh Uddin
16ce409730 Import translations. DO NOT MERGE
Change-Id: I9d37015bcfe0ab83750ebe2e9d2a31b3e5933f3b
Auto-generated-cl: translation import
2014-09-08 10:30:58 -07:00
Baligh Uddin
4adaa34bd5 am e6b9a3aa: (-s ours) am 3dc73b33: (-s ours) Import translations. DO NOT MERGE
* commit 'e6b9a3aa1e104ea1526e8b9fef4d8b14689c05aa':
  Import translations. DO NOT MERGE
2014-08-25 22:07:18 +00:00
Baligh Uddin
fbbba84302 Import translations. DO NOT MERGE
Change-Id: Ic2c6080e9372b706f00f60742ba55fe2f8832da8
Auto-generated-cl: translation import
2014-08-24 08:54:25 -07:00
Baligh Uddin
e6b9a3aa1e am 3dc73b33: (-s ours) Import translations. DO NOT MERGE
* commit '3dc73b331fda1b51a95a8ca33b3d6745dbe24ff2':
  Import translations. DO NOT MERGE
2014-08-22 17:16:25 +00:00
Baligh Uddin
3dc73b331f Import translations. DO NOT MERGE
Change-Id: Id9003bae28588686dc142bc6eb59697b7d25cea9
Auto-generated-cl: translation import
2014-08-22 09:40:58 -07:00
Tony Mantler
c1a760bf36 Match dup accounts against all accounts, not just Email
Also deanonymize loader inner classes
and fix a bug on re-reading a cursor after rotation.

b/16326913
b/15547554

Change-Id: I6e9dd36f425c1df93823a4b9d1faba15a802ad50
2014-08-21 22:12:26 +00:00
Qiwen Zhao
c0977c8580 reset to ub-mail-master-release at 1235730 2014-08-20 14:15:13 -07:00
Anthony Lee
8c65e50bfe b/17135753. Make sure to free ServiceConnection.
The only way that the ServiceConnection was not being freed is if
there was an Exception (other than RemoteException) being thrown
out of mTask.run(). Now the call to unbindService() is called
in a finally() block surrounding that block of code.

Change-Id: I597412233381894be76d3c8bdf99fc7d96794dc2
2014-08-20 14:08:47 -07:00
Andrew Sapperstein
b04201335c Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev 2014-08-20 01:43:56 +00:00
Andrew Sapperstein
a3341c3d44 Use appcompat photoviewer.
Change-Id: I4e551e393356f7039e5186cb3f9d9f40ac73cfb9
2014-08-19 13:57:33 -07:00
The Android Automerger
1235730a47 merge in ub-mail-master-release history after reset to fc67cb019c 2014-08-19 13:50:27 -07:00
Rohan Shah
523d3073f6 Update Notifications (Email)
Got rid of large icon and only setting 'small icon' now.
If conceal sensitive info has been enabled, also hides
the ending of the account address.

Bug: 16987147
Change-Id: I0899a602d1dfdaef980002746ce9079912f0525c
2014-08-19 17:54:45 +00:00
Paul Westbrook
fc67cb019c am 1371dd99: Change method signature
* commit '1371dd990ff08186d6754a8ca24b87b4c11dd746':
  Change method signature
2014-08-19 16:51:26 +00:00
Paul Westbrook
1371dd990f Change method signature
Bug: 16153528
Change-Id: I7f183bab825176814275f6c99981554e4529983a
2014-08-19 03:28:43 -07:00
Tony Mantler
3f32ffd759 am f4b55c8e: Merge "Fix folder sync settings for tablet" into ub-gmail-ur14-dev
* commit 'f4b55c8edb059d0704fad76b85b7a3f7a36dfec2':
  Fix folder sync settings for tablet
2014-08-18 16:51:48 +00:00
Tony Mantler
1e6f26af80 Merge "Drawer resource updates" into ub-gmail-ur14-dev 2014-08-16 04:03:42 +00:00
Tony Mantler
ebae672af4 Drawer resource updates
b/17071718

Change-Id: I4a3a93b23c68f63d306fedf39ebbae09ee5ee094
2014-08-19 14:20:12 -07:00
Baligh Uddin
421b73b4fd Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:56:00 +00:00
Baligh Uddin
8706ea6ab1 am d9a3ebd6: (-s ours) am 307cf10c: (-s ours) Import translations. DO NOT MERGE
* commit 'd9a3ebd6c62221ae0e3dafd34a3e1c65d6df7208':
  Import translations. DO NOT MERGE
2014-08-16 04:00:52 +00:00
Tony Mantler
f4b55c8edb Merge "Fix folder sync settings for tablet" into ub-gmail-ur14-dev 2014-08-16 03:56:00 +00:00
Baligh Uddin
ccc705116a Import translations. DO NOT MERGE
Change-Id: I9d081741671b2f03401bdde8bf9dfe7b00086eb3
Auto-generated-cl: translation import
2014-08-15 19:50:19 -07:00
Rohan Shah
14e1d8ac96 am 3984736f: Merge "Fix FolderSelectionActivity Issue (Widget)" into ub-gmail-ur14-dev
* commit '3984736fb2e46629950e9666f7078862da455cf1':
  Fix FolderSelectionActivity Issue (Widget)
2014-08-16 01:12:22 +00:00
Rohan Shah
3fd0cbaa91 am a8a185f7: Merge "Update Notifications Icon (Email)" into ub-gmail-ur14-dev
* commit 'a8a185f75c1173278d5930a07687a7a3d6bdfe1b':
  Update Notifications Icon (Email)
2014-08-16 01:12:21 +00:00
Tony Mantler
ac4b0efd9f Fix folder sync settings for tablet
b/17068128

Change-Id: Ia61cba10fb0edc97448d9ff39aa58578db1d4ac7
2014-08-15 16:24:38 -07:00
Tony Mantler
2d109f4f93 am 486e9710: Fix providers.xml alternate diversion
* commit '486e971066979f41c1a38ad7414cd1430a55d87e':
  Fix providers.xml alternate diversion
2014-08-15 22:59:26 +00:00
Baligh Uddin
d9a3ebd6c6 am 307cf10c: (-s ours) Import translations. DO NOT MERGE
* commit '307cf10c2a64757bc91f375166f31728d417b508':
  Import translations. DO NOT MERGE
2014-08-15 22:20:20 +00:00
Baligh Uddin
307cf10c2a Import translations. DO NOT MERGE
Change-Id: I9d6ea0a8130f01da4face9fe1a5a64a96ae4b08d
Auto-generated-cl: translation import
2014-08-15 12:29:49 -07:00
Tony Mantler
486e971066 Fix providers.xml alternate diversion
b/17048013

Change-Id: If2bc857266a6ba1445bf1fabbaed179c1b13a14f
2014-08-15 11:54:56 -07:00
Rohan Shah
3984736fb2 Merge "Fix FolderSelectionActivity Issue (Widget)" into ub-gmail-ur14-dev 2014-08-15 18:45:09 +00:00