ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,515 Commits 2 Branches 0 Tags 45 MiB
5117621aab
Commit Graph

6515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mindy Pereira
77c2499523 am d59affc5: Merge "Revert "Fix build break"" into ics-mr1 
* commit 'd59affc5e6eb5849a91fa990a05943cc59d9ac30':
  Revert "Fix build break"
 2011-11-02 17:50:05 +00:00
Mindy Pereira
af9e4ef82e am ddcb0db4: Merge "Revert "Add utility to determine if account can\'t auto-sync due to roaming"" into ics-mr1 
* commit 'ddcb0db429df71356360b2224b56b01b7051c34c':
  Revert "Add utility to determine if account can't auto-sync due to roaming"
 2011-11-02 17:50:05 +00:00
Mindy Pereira
d0e7f538cb resolved conflicts for merge of 565e94cd to master 
Change-Id: I424541a5c8d1d74b78e19170e40edb071fa68c0e
 2011-11-02 10:47:25 -07:00
Mindy Pereira
b4b2933b1e resolved conflicts for merge of f4d30527 to master 
Change-Id: Ia79af94545c878595dcd1bb4e2fec98d49d94838
 2011-11-02 10:36:02 -07:00
Marc Blank
4d7a94c13d am 6f6aee06: Merge "Fix build break" into ics-mr1 
* commit '6f6aee06ec97690176d08e80179bbd5ba7d940b8':
  Fix build break
 2011-11-02 17:31:50 +00:00
Marc Blank
6638627595 am 483f4927: Merge "Add utility to determine if account can\'t auto-sync due to roaming" into ics-mr1 
* commit '483f49274e0aed3d4158ac6c2ba9fd693acb2809':
  Add utility to determine if account can't auto-sync due to roaming
 2011-11-02 17:31:48 +00:00
Eric Fischer
42ec3e7c6f am 9f59af95: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '9f59af95a70bbb0099473a17da26157379a8d170':
  Import revised translations.  DO NOT MERGE
 2011-11-02 17:31:30 +00:00
Mindy Pereira
4c3da68bb3 am 32997aa3: New assets for notifications. 
* commit '32997aa3746cf11034de583e7e4fd93709dd74c1':
  New assets for notifications.
 2011-11-02 17:30:30 +00:00
Eric Fischer
4b70aa3c90 Import revised translations. 
Change-Id: Ie19d9c6a94bf72431ddb8d0e2f4398cd052036a9
 2011-11-02 10:21:30 -07:00
Mindy Pereira
c67148bfc9 Make the compose from field look just like the one in Gmail. 
Fixes b/5520687 email compose view from field looks bad

Change-Id: Ic6f79ce5b4f4a725bceba98ab1d60e528e28dc25
 2011-11-02 09:21:03 -07:00
Marc Blank
dea198bb04 Add utility to determine if account can't auto-sync due to roaming 
* We need to call this out to the user (a surprised user is an
  unhappy user)
* Required for fix to bug referenced below

Bug: 5533550
Change-Id: I64a870a703de7e02ce882aefc3636a1668021eb8
 2011-11-02 08:59:36 -07:00
Mindy Pereira
2e3a97d625 Remove extra padding from the top of the labels list. 
Wasn't needed and prevented an extra item from being shown
on smaller screen devices.
Fixes b/5521012 Fix padding in the folders list

Change-Id: Ifc940d44b9a8a0a0f0f9d04fc1958f4810adcdbe
 2011-11-02 08:58:40 -07:00
The Android Automerger
7a8724e4d8 merge in ics-mr1-release history after reset to ics-mr1 2011-11-02 06:46:33 -07:00
Mindy Pereira
d59affc5e6 Merge "Revert "Fix build break"" into ics-mr1 2011-11-01 17:24:22 -07:00
Mindy Pereira
ddcb0db429 Merge "Revert "Add utility to determine if account can't auto-sync due to roaming"" into ics-mr1 2011-11-01 17:24:17 -07:00
Mindy Pereira
565e94cd6d Merge "Revert "Create a require manual sync dialog."" into ics-mr1 2011-11-01 17:24:12 -07:00
Mindy Pereira
a862301129 Revert "Fix build break" 
This reverts commit f96a657aaf
 2011-11-01 17:21:18 -07:00
Mindy Pereira
ea4adf0c6b Revert "Add utility to determine if account can't auto-sync due to roaming" 
This reverts commit 95abeed64a
 2011-11-01 17:17:06 -07:00
Mindy Pereira
649eaedd73 Revert "Create a require manual sync dialog." 
This reverts commit 5ae8d889a8
 2011-11-01 17:16:16 -07:00
Mindy Pereira
f4d30527c4 Merge "Create a require manual sync dialog." into ics-mr1 2011-11-01 16:51:37 -07:00
Marc Blank
6f6aee06ec Merge "Fix build break" into ics-mr1 2011-11-01 16:43:44 -07:00
Marc Blank
f96a657aaf Fix build break 
* For now, we can't have Email build under the SDK

Change-Id: Iae0858d81734478f39077395fa0c9705af027c9f
 2011-11-01 16:13:45 -07:00
Mindy Pereira
5ae8d889a8 Create a require manual sync dialog. 
Fixes b/5533550 [Verizon Reported Issue]Add one-time notice to user when auto sync is disabled due to security policy

Change-Id: I90e295158136def96502f78c94a5e3ec00a059bc
 2011-11-01 15:54:20 -07:00
Marc Blank
483f49274e Merge "Add utility to determine if account can't auto-sync due to roaming" into ics-mr1 2011-11-01 15:38:50 -07:00
Marc Blank
95abeed64a Add utility to determine if account can't auto-sync due to roaming 
* We need to call this out to the user (a surprised user is an
  unhappy user)
* Required for fix to bug referenced below

Bug: 5533550
Change-Id: I7da337057b9b28300ddd485283920e12c1ae53da
 2011-11-01 14:11:43 -07:00
Eric Fischer
9f59af95a7 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-01 13:51:58 -07:00
Eric Fischer
d1711e7cbf Import revised translations. DO NOT MERGE 
Change-Id: Ie824a11ea311eb72f166a5692b54b1fd3ab64bae
 2011-11-01 13:36:23 -07:00
Marc Blank
ae0a1a1856 Merge "Increase CHAR LIMIT for policy strings" 2011-11-01 11:34:14 -07:00
Marc Blank
779a2dcb33 Increase CHAR LIMIT for policy strings 
Bug: 5544632
Change-Id: I9514d92c4477ecc52e3ec3123e8c53959fe8c23f
 2011-11-01 11:25:07 -07:00
Mindy Pereira
32997aa374 New assets for notifications. 
Fixes bug:5519441 Notification icons should be at 100% opacity

Change-Id: Ia98e00be96655cb9651d6b50867bb9ec95b8a8ae
 2011-11-01 10:42:55 -07:00
The Android Open Source Project
442731383e Reconcile with ics-mr1-release 
Change-Id: I04474a99874ad272fba4061c6a8d7eacfd635ce4
 2011-10-31 13:19:27 -07:00
Eric Fischer
4752b28018 am 2b7baafa: (-s ours) am c972da43: (-s ours) Import revised translations. DO NOT MERGE 
* commit '2b7baafa703f6a1f01781dfaef777f7ad5616e55':
  Import revised translations.  DO NOT MERGE
 2011-10-31 12:26:47 +00:00
The Android Automerger
db4ad61ffb merge in ics-mr1-release history after reset to ics-mr1 2011-10-30 06:47:39 -07:00
Eric Fischer
2b7baafa70 am c972da43: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'c972da438118d0a44c019b8eb40ab84ae9ff92b0':
  Import revised translations.  DO NOT MERGE
 2011-10-29 03:15:32 +00:00
Eric Fischer
c972da4381 Import revised translations. DO NOT MERGE 
Change-Id: I37b1a87651969519d213958c58986bf7fb766a9b
 2011-10-28 17:05:29 -07:00
Eric Fischer
4f92a06a0b am 0b870d7d: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '0b870d7de8091a5bf3d7b50076f22f0d4780fa78':
  Import revised translations.  DO NOT MERGE
 2011-10-28 22:28:00 +00:00
Eric Fischer
0b870d7de8 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-28 14:00:45 -07:00
Eric Fischer
5f097ea303 Import revised translations. DO NOT MERGE 
Change-Id: If4a1ebb1e2e50716d9273c8dc7a709171b7f065e
 2011-10-28 13:52:04 -07:00
Eric Fischer
b9aedba34a Merge "Import revised translations." 2011-10-28 12:13:24 -07:00
Eric Fischer
296345efa7 Import revised translations. 
Change-Id: Ic259e6b12fa30085e9be0f5eb0dfb486d376ee60
 2011-10-28 11:22:10 -07:00
Eric Fischer
7a7cfbee5c am f0436aee: (-s ours) am 273c32b3: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'f0436aee23f394e16ebe7ef9d41a1c3c27277916':
  Import revised translations.  DO NOT MERGE
 2011-10-27 21:54:13 +00:00
Eric Fischer
f0436aee23 am 273c32b3: (-s ours) Import revised translations. DO NOT MERGE 
* commit '273c32b363dafdf8f1054a6d264af094ee4024b3':
  Import revised translations.  DO NOT MERGE
 2011-10-27 21:46:44 +00:00
Marc Blank
52cd41af58 Merge "Remove unneeded logging" 2011-10-27 13:15:04 -07:00
Marc Blank
9e2330e473 Remove unneeded logging 
Change-Id: I9866a678b58728f5e0ddcbb3596beb2e53c9a7fa
 2011-10-27 13:09:05 -07:00
Marc Blank
ffe86bb316 Merge "Provide four default "quick responses" for new accounts" 2011-10-27 10:41:01 -07:00
Eric Fischer
273c32b363 Import revised translations. DO NOT MERGE 
Change-Id: I86833a451b695da00f03444a56b203fb9a1486ad
 2011-10-27 09:52:15 -07:00
Eric Fischer
ead7e23143 am f54dbc8e: (-s ours) Merge changes Ie26719cb,I6d1b943b into ics-mr1 
* commit 'f54dbc8e773642f924b9390d89df8779577e2493':
  Import revised translations.  DO NOT MERGE
  Restore deleted string still referenced from layout.
 2011-10-27 16:51:07 +00:00
Eric Fischer
f54dbc8e77 Merge changes Ie26719cb,I6d1b943b into ics-mr1 
* changes:
  Import revised translations.  DO NOT MERGE
  Restore deleted string still referenced from layout.
 2011-10-27 09:45:11 -07:00
Eric Fischer
931ebcb22d Import revised translations. DO NOT MERGE 
Change-Id: Ie26719cb115cd918ba99a7a780aca6c70e19ed4f
 2011-10-26 17:40:04 -07:00
Eric Fischer
2e4594ddb5 Restore deleted string still referenced from layout. 
Change-Id: I6d1b943bc4fd0a3458ff1b5d2d47d0f7f9e9d5dd
 2011-10-26 17:27:15 -07:00