Qiwen Zhao
254afb61d1
reset to 1235730
with history
2014-08-20 15:06:31 -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
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
Baligh Uddin
7f60bfbf63
am 3ff7d576
: (-s ours) am 421b73b4
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '3ff7d5769809546ed2a7bedb5080d1ffbbf5f555':
Import translations. DO NOT MERGE
2014-08-17 14:17:58 +00:00
Baligh Uddin
3ff7d57698
am 421b73b4
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '421b73b4fdacb10c47cce9fc9321fcf4c6923802':
Import translations. DO NOT MERGE
2014-08-17 13:58:47 +00:00
Baligh Uddin
1999b6b7be
am abdf5018
: (-s ours) am 8706ea6a
: (-s ours) am d9a3ebd6
: (-s ours) am 307cf10c
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'abdf5018d254325f66ba57a02ad1e22110cf9885':
Import translations. DO NOT MERGE
2014-08-16 04:36:57 +00:00
Baligh Uddin
abdf5018d2
am 8706ea6a
: (-s ours) am d9a3ebd6
: (-s ours) am 307cf10c
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8706ea6ab1711c9c1fd014a89fb5c25039174017':
Import translations. DO NOT MERGE
2014-08-16 04:20:13 +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
421b73b4fd
Merge "Import translations. DO NOT MERGE" into lmp-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
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
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
b9287b8a78
am 6d165bca
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6d165bca6b835f289d78322a415bc48a48e2dd57':
Import translations. DO NOT MERGE
2014-08-15 06:03:43 +00: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
568de310b6
am ea99a057
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ea99a057330a118ac1f4371aac0f603401eb30cf':
Import translations. DO NOT MERGE
2014-08-15 03:42:22 +00: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
James Lemieux
fcc6020924
am 66ff95a5
: Merge "End of Life screen for Email" into ub-gmail-ur14-dev
...
* commit '66ff95a5613aed24fb0213bc559b4fd17c2eb1a4':
End of Life screen for Email
2014-08-14 21:04:54 +00:00
Rohan Shah
c453deeefc
am 7941b406
: Update Notifications (Email)
...
* commit '7941b406cf8e84fa672a4f28181b9b3dbd396079':
Update Notifications (Email)
2014-08-14 00:39:27 +00: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
df1a68ebd0
am 43106e9d
: Merge "Extend MailboxSettings to handle full folder list" into ub-gmail-ur14-dev
...
* commit '43106e9de3548603094107bec965b941c4e93c21':
Extend MailboxSettings to handle full folder list
2014-08-13 22:13:40 +00:00
Martin Hibdon
cd267c4744
am 80982db3
: Update email version number
...
* commit '80982db38b18ed85c1cd48c2cd1a76bc1d0ebcd9':
Update email version number
2014-08-13 18:35:22 +00:00
Martin Hibdon
80982db38b
Update email version number
...
Change-Id: I1a86266060cf39461ac1ab77a2383885d6d7a75d
(cherry picked from commit 2fc57a8bac
)
2014-08-13 18:29:18 +00: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
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
5a8065ef11
am ca02ab31
: Don\'t export MailboxSettings
...
* commit 'ca02ab3161171c347aa01e703267446c76f22aa7':
Don't export MailboxSettings
2014-08-12 23:08:51 +00:00
Tony Mantler
ca02ab3161
Don't export MailboxSettings
...
b/16541463
Change-Id: I5cebc3c679c8cd80d1344edb21b253c3a4a12d6c
2014-08-12 15:42:57 -07:00
Baligh Uddin
3b60e1ec3c
am 48d6f0de
: (-s ours) am e32ac326
: (-s ours) Import translations. DO NOT MERGE
...
* commit '48d6f0de4f13c5a93e5f820e9d3ac8ff4e18a247':
Import translations. DO NOT MERGE
2014-08-12 16:54:41 +00:00
Baligh Uddin
48d6f0de4f
am e32ac326
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e32ac326f40fe44472324313b09627ac225893b9':
Import translations. DO NOT MERGE
2014-08-12 16:49:16 +00:00
Baligh Uddin
e29403d7c8
am a780beb0
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a780beb0f8e5d42c0e30b44ce2dac1bfc689175b':
Import translations. DO NOT MERGE
2014-08-12 16:48:23 +00: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
Baligh Uddin
e32ac326f4
Import translations. DO NOT MERGE
...
Change-Id: I8c200774872f7ebb5a8a80f3c540726fc5bca5e2
Auto-generated-cl: translation import
2014-08-11 11:24:09 -07:00
Baligh Uddin
7ae1a977d3
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-08-11 18:20:32 +00:00
Martin Hibdon
2fc57a8bac
Update email version number
...
Change-Id: I1a86266060cf39461ac1ab77a2383885d6d7a75d
2014-08-11 16:12:39 -07:00
Baligh Uddin
80d5ccf843
Import translations. DO NOT MERGE
...
Change-Id: I0dadaaca3b0ca71f87008c9e161605fb6fd26305
Auto-generated-cl: translation import
2014-08-11 11:28:35 -07:00
Tony Mantler
2cdb08d494
am ea0c4007
: Use margin instead of padding to work around ICS/JB bug
...
* commit 'ea0c40079ca7c0e6d6c36ec6080c52daa87a761e':
Use margin instead of padding to work around ICS/JB bug
2014-08-08 21:54:40 +00: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