Mindy Pereira
bf036b9e1a
am 1b6e1ae3
: Fix padding on reply quoted text area and ids.
...
* commit '1b6e1ae3066f1a8ac32917e0c05739aa368af145':
Fix padding on reply quoted text area and ids.
2011-11-05 16:40:01 +00:00
The Android Open Source Project
f685bfc54e
Reconcile with ics-mr1-release
...
Change-Id: Ieb4fc20ab626c2a405f11f83783115dd5d0a7106
2011-11-04 08:31:33 -07:00
Mindy Pereira
4cd64ad4d5
Fixup quoted text styling.
...
Fixes for b/5517524 compose on tablets needs redlines
Change-Id: I8a7fab7ad635deee9ddb23f59ea2caf0848f496d
2011-11-03 17:33:26 -07:00
Mindy Pereira
1b6e1ae306
Fix padding on reply quoted text area and ids.
...
Part of fixes for b/5517524 compose on tablets needs redlines
Change-Id: I7b526c21f1a11532b8b0d598a309174bb38a9cf6
2011-11-03 17:10:34 -07:00
Mindy Pereira
ce78abeb61
am 46f6a96d
: Use mailcomon for attachment styling.
...
* commit '46f6a96d8aae2724a9a9af2522f4b2b6c702d48d':
Use mailcomon for attachment styling.
2011-11-03 23:24:28 +00:00
Mindy Pereira
6747b51e11
am aa90b4f2
: Update attachment styles.
...
* commit 'aa90b4f2ebc3f7b3c1e31cfdaf2b8433d5495b4d':
Update attachment styles.
2011-11-03 23:24:27 +00:00
Mindy Pereira
46f6a96d8a
Use mailcomon for attachment styling.
...
Part of fixes for b/5517524 compose on tablets needs redlines
Change-Id: Ib0a2e91183583f2b02d6006aa4902bdfefaf4a82
2011-11-03 15:16:17 -07:00
Mindy Pereira
aa90b4f2eb
Update attachment styles.
...
Part of fixes for b/5517524 compose on tablets needs redlines
Change-Id: I286c6fa57229e993660dd307fc14b929b701b47f
2011-11-03 13:53:37 -07:00
Mindy Pereira
fdff68d5dd
am 31e5beba
: Create tablet compose view.
...
* commit '31e5beba35287258e20b0fff5b9138a3b0892221':
Create tablet compose view.
2011-11-03 18:41:08 +00:00
Mindy Pereira
31e5beba35
Create tablet compose view.
...
part of Fixes for b/5517524 compose on tablets needs redlines
Change-Id: I107b58dfda3f228457a3a3b90c8f41e832007c9d
2011-11-03 10:48:45 -07:00
Mindy Pereira
3074ba91f6
resolved conflicts for merge of 80966740
to master
...
Change-Id: Iab18d4cd7c85b0ef4467bcf745d0c84bde7b3846
2011-11-03 09:22:51 -07:00
Mindy Pereira
809667407c
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: I1d5380928429a829dbcb31d5f7309f9bc98e8dff
2011-11-03 08:22:46 -07:00
The Android Automerger
69032ac88a
merge in ics-mr1-release history after reset to ics-mr1
2011-11-03 06:44:35 -07:00
Andy Huang
f20f3e216f
am 56d6f4a6
: Merge "Style cleanup in email message header to make it more like Gmail" into ics-mr1
...
* commit '56d6f4a6f13b53051d17579c54cebe0372515f3d':
Style cleanup in email message header to make it more like Gmail
2011-11-03 05:17:42 +00:00
Andy Huang
56d6f4a6f1
Merge "Style cleanup in email message header to make it more like Gmail" into ics-mr1
2011-11-02 22:13:24 -07:00
Eric Fischer
806b8fee55
am c1fd962b
: (-s ours) am 53b0b354
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'c1fd962b7455df04c41300da8b7731e28f2a2689':
Import revised translations. DO NOT MERGE
2011-11-03 00:43:25 +00:00
Eric Fischer
c1fd962b74
am 53b0b354
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '53b0b354e75e76c93e4dc09054a314fbd8cce0da':
Import revised translations. DO NOT MERGE
2011-11-03 00:04:26 +00:00
Andy Huang
358a815701
Style cleanup in email message header to make it more like Gmail
...
Linkify email addresses in expanded message details
Remove divider line in upper header on phone
Embolden sender name
Twiddle expanded details line spacing and padding to match Gmail
Add space char to collapsed details recipient enumerator (comma)
Bug: 5520692
Bug: 5520787
Change-Id: Iad4a265168d111aa01654a33a9a14f7968fc3181
2011-11-02 15:50:00 -07:00
Mindy Pereira
0a83efd653
am 3cc76ab8
: Merge "Make the compose from field look just like the one in Gmail." into ics-mr1
...
* commit '3cc76ab810a9a5f3706def4faf08ab73b7298080':
Make the compose from field look just like the one in Gmail.
2011-11-02 22:49:48 +00:00
Mindy Pereira
356fafbfcc
am 38a39bbd
: Merge "Remove extra padding from the top of the labels list." into ics-mr1
...
* commit '38a39bbdd5d3f4005e8d43a95e567c46fae469ca':
Remove extra padding from the top of the labels list.
2011-11-02 22:49:48 +00:00
Mindy Pereira
3cc76ab810
Merge "Make the compose from field look just like the one in Gmail." into ics-mr1
2011-11-02 15:45:51 -07:00
Mindy Pereira
38a39bbdd5
Merge "Remove extra padding from the top of the labels list." into ics-mr1
2011-11-02 15:45:44 -07:00
Eric Fischer
53b0b354e7
Import revised translations. DO NOT MERGE
...
Change-Id: I93089db8fef9d2a1388ed6edbfea82ca106d4c75
2011-11-02 15:17:40 -07:00
Eric Fischer
4aa1e3f6d2
Merge "Import revised translations."
2011-11-02 14:14:12 -07:00
Marc Blank
4317ff162e
am dea198bb
: Add utility to determine if account can\'t auto-sync due to roaming
...
* commit 'dea198bb041754745c3b1522671fd31a79c7168c':
Add utility to determine if account can't auto-sync due to roaming
2011-11-02 19:00:58 +00:00
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