Commit Graph

10179 Commits

Author SHA1 Message Date
Anthony Lee 0397e7fb23 b/17209397. NOOP getServiceMap() if we are in the tombstone app.
If this is the Email Tombstone app, we throw an ISE when
we launch the app after resetting data because certain
services do not exist in this version of the app.

Change-Id: I01d88ac2b745d45c1835354b36837f8aaaf378d8
2014-08-25 14:12:16 -07:00
Jin Cao 65c217943a Remove getSuggestionsAuthority
Change-Id: I0675c1e59047723cef2ad072b9a1e003ca03aa11
2014-08-22 15:13:39 -07:00
Jin Cao 9ac6ec7285 Merge "Remove default search for Email" into ub-gmail-ur14-dev 2014-08-22 22:07:43 +00:00
Jin Cao c926864e4b Remove default search for Email
b/17209360

Change-Id: I798139e5ab6f8cd29dde1dd475de17138330d8c5
2014-08-22 14:44:26 -07:00
Tony Mantler 207a35f174 Fix search mailbox status on early-out when searching
b/17109656

Change-Id: I8ff643d57a461d81519da65d017c8c3cc95c5659
2014-08-22 14:29:33 -07:00
Tony Mantler 473ce1fa35 Fix some AOSP NPEs
In AOSP the account types of IMAP and POP overlap so we can't
reverse the protocol from the account type. This is OK since all
we care about is if it's Exchange or not.

b/17183137

Change-Id: I112e56c9a0c0009a74f391749d535ada9f0f99ba
(cherry picked from commit 18663ef54ed2d7217d0176b4c5928380deaf9f64)
2014-08-22 17:58:22 +00:00
Anthony Lee 355e9dffc3 Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev 2014-08-22 17:15:44 +00:00
Anthony Lee ce1faa889d b/17193866. Update policies when we reconcile.
In the situation where we have deleted an Account from our
provider reconciliation will delete the associated amAccount.
Unfortunately, there isn't any sort of side effect code path
that considers that policies may need to be updated when
this Account is deleted. This CL injects that logic.

Change-Id: I27c7a35efbdca4be274a9d3d8f7ce698f9204092
2014-08-22 10:03:44 -07:00
Baligh Uddin 67995a417a Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev 2014-08-22 16:37:18 +00: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
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
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 1371dd990f Change method signature
Bug: 16153528
Change-Id: I7f183bab825176814275f6c99981554e4529983a
2014-08-19 03:28:43 -07:00
Baligh Uddin 3c2ffe62cf Import translations. DO NOT MERGE
Change-Id: I408c22b31c33a03597b9e3613c1bfd861f7b1f17
Auto-generated-cl: translation import
2014-08-18 08:03:44 -07: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
Tony Mantler f4b55c8edb Merge "Fix folder sync settings for tablet" into ub-gmail-ur14-dev 2014-08-16 03:56:00 +00:00
Tony Mantler ac4b0efd9f Fix folder sync settings for tablet
b/17068128

Change-Id: Ia61cba10fb0edc97448d9ff39aa58578db1d4ac7
2014-08-15 16:24:38 -07:00
Rohan Shah 3984736fb2 Merge "Fix FolderSelectionActivity Issue (Widget)" into ub-gmail-ur14-dev 2014-08-15 18:45:09 +00:00
Rohan Shah 2537c352e4 Fix FolderSelectionActivity Issue (Widget)
Part of the AppCompat audit

Bug: 16987963
Change-Id: I1dc21f53e7f3dbb9cc9ad6dcacf177cfc8ad7658
2014-08-15 17:19:44 -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 a8a185f75c Merge "Update Notifications Icon (Email)" into ub-gmail-ur14-dev 2014-08-15 18:45:09 +00:00
Rohan Shah b5e710f447 Update Notifications Icon (Email)
Rest in pieces little gmail icon :(

Change-Id: I14459cba33cf61f6717d922bdb006d8d56ad893c
2014-08-15 17:54:08 -07:00
Baligh Uddin 6d165bca6b Import translations. DO NOT MERGE
Change-Id: Ice21d328d3d7e6364ec40a6d3b84b8b03ae6b81b
Auto-generated-cl: translation import
2014-08-14 22:19:23 -07:00
Baligh Uddin ea99a05733 Import translations. DO NOT MERGE
Change-Id: I8449b7fd0a2636b78453332a99452ac688daf15b
Auto-generated-cl: translation import
2014-08-14 20:28:06 -07:00
Rohan Shah 7941b406cf Update Notifications (Email)
Switched out icons (For updated mail notify icon).

Bug: 16987147
Change-Id: I695b4c51daddc47eecbe7d856de642932190c4bb
2014-08-13 17:24:52 -07:00
Tony Mantler 43106e9de3 Merge "Extend MailboxSettings to handle full folder list" into ub-gmail-ur14-dev 2014-08-12 23:14:35 +00:00
Tony Mantler 9f14d6b0de Extend MailboxSettings to handle full folder list
b/16541463

Change-Id: If428413ad258497a5654fa095d51cd60f6ed4e18
2014-08-13 14:18:01 -07:00
Martin Hibdon 80982db38b Update email version number
Change-Id: I1a86266060cf39461ac1ab77a2383885d6d7a75d
(cherry picked from commit 2fc57a8bac)
2014-08-13 18:29:18 +00:00
James Lemieux 66ff95a561 Merge "End of Life screen for Email" into ub-gmail-ur14-dev 2014-08-12 23:14:33 +00:00
James Lemieux 50591a7be4 End of Life screen for Email
b/16843301

This introduces a new build target: EmailGoogleTombstone.
Building with a tapas line that includes that target will
produce EmailGoogleTombstone.apk. The apk includes the
EmailProvider and AttachmentProvider (for migration to
Gmail) and an activity that explains to the user where to
find their email data.

Change-Id: Ib8192b46d9017e04f5c99f5c8e509531198eec07
2014-08-14 11:31:33 -07:00
Tony Mantler ca02ab3161 Don't export MailboxSettings
b/16541463

Change-Id: I5cebc3c679c8cd80d1344edb21b253c3a4a12d6c
2014-08-12 15:42:57 -07:00
Baligh Uddin a780beb0f8 Import translations. DO NOT MERGE
Change-Id: I860f4cdce83a78886cf33358d31118f5dafa9c89
Auto-generated-cl: translation import
2014-08-11 11:27:53 -07:00
Tony Mantler ea0c40079c Use margin instead of padding to work around ICS/JB bug
b/16897364

Change-Id: I777446331efcf7735a4d3de9eeedd7fa57dc8d36
2014-08-08 14:48:18 -07:00
Baligh Uddin 5a564d6a6b am 3c16f24b: (-s ours) Import translations. DO NOT MERGE
* commit '3c16f24b11e75d36e914b8fd02f0b2b852210a7c':
  Import translations. DO NOT MERGE
2014-08-08 16:16:33 +00:00
Baligh Uddin 3c16f24b11 Import translations. DO NOT MERGE
Change-Id: I670f76af96ecb6754443ddedfd0d660def797239
Auto-generated-cl: translation import
2014-08-08 08:52:29 -07:00
Tony Mantler 0c4f45e854 Add chromium.org to providers.xml
Change-Id: Iea88c59bcd883e7d06b3e55dcd3edb74e3c5a324
2014-08-07 15:51:38 -07:00
Tony Mantler 4c86584685 Don't return a protocol for a null account type
b/16735532

Change-Id: Ie83709fe3a9942ef946cf86f853b3d6565dc5799
2014-08-07 15:36:20 -07:00
Tony Mantler f1789afa53 Switch null checks to TextUtils.isEmpty()
b/16872654

Change-Id: Ib8943f068ad6988ff08f8bfd54e2df8fa5ce0274
2014-08-07 14:11:02 -07:00
Anthony Lee 8218d00634 Merge "Make sure that we close the cursor." into ub-gmail-ur14-dev 2014-08-07 15:00:45 +00:00
Anthony Lee 4524dccde8 Make sure that we close the cursor.
Found this problem while testing Email migration.

Change-Id: I07862b5c4dd2ef189a87f7dbd085030c448f365f
2014-08-07 13:13:21 -07:00
Tony Mantler 1381d4083b Skip null/empty account types
b/16730607

Change-Id: I6b3207edbf3dc841dd2222e92f69d270a0caf773
2014-08-07 12:58:18 -07:00
Régis Décamps 34aae3cbc4 Merge "Fix `getAllAmAccounts()` returning duplicated accounts" into ub-gmail-ur14-dev 2014-08-05 00:19:02 +00:00
Régis Décamps f9d845c1b7 Fix `getAllAmAccounts()` returning duplicated accounts
Use a set to save the account types, in order to de-duplicate identical
types.

Also, remove unused imports.

Bug: 16811863 Duplicate POP accounts are listed
Change-Id: If699d03b2c12959cfde9926bec9352b71c3d8912
2014-08-06 20:27:39 +02:00
Paul Westbrook e76b7bbf78 Fix proguard rule
-keepclasseswithmembers is strict.  If it isn't able to find any of the
methods listed, the whole class can be stripped

Bug: 16825652
Change-Id: I1e8eefba9e0cf4b596f7e8041161e12bde6b51c6
2014-08-06 00:41:47 -07:00
Paul Westbrook 4764cb8d48 Fix unit test
Bug: 16825652
Change-Id: I1c139afb0f3aa50dca742ed48c92a16f9078ea59
2014-08-05 18:24:51 -07:00
Andrew Sapperstein 36fd389381 Use ShortcutWidgetTheme.
Fixes b/16767953 and b/16131423.

Also removes the obsolete ic_launcher_shortcut_folder.

Change-Id: I73e800b1e83b95eaa05cd800178a7de86072c00d
2014-08-04 20:05:17 +00:00
Andrew Sapperstein 05a96bdccd switch to appcompat. b/16664350
Change-Id: I3391bc352d6b9bc2d59ca6ac0088e88b1edcc76d
2014-08-04 11:18:58 -07:00