Commit Graph

6462 Commits

Author SHA1 Message Date
Eric Fischer
f50e5f5b59 Import revised translations.
Change-Id: If6d482d1cfedad381cbf56aa6dd1be88ed0beb8b
2011-11-10 14:11:02 -08:00
Mindy Pereira
81d234aa8c am cc9845e8: Make sure we show/ hide all quoted text views.
* commit 'cc9845e86ef500b4e4c65c141cac45f88d426696':
  Make sure we show/ hide all quoted text views.
2011-11-09 21:19:27 +00:00
Marc Blank
f17731a1ba am cb440142: Merge "Up version number for release" into ics-mr1
* commit 'cb440142baa5809d896c6e4e3aeaa6c26b033049':
  Up version number for release
2011-11-09 21:19:27 +00:00
Marc Blank
406641ce09 am 00099da1: Merge "Make EAS Email syncable after GB/HC -> ICS upgrade" into ics-mr1
* commit '00099da1b3b9d91574187e70182e5384debb3731':
  Make EAS Email syncable after GB/HC -> ICS upgrade
2011-11-09 21:19:26 +00:00
Mindy Pereira
8a90477033 am aff4bdac: Merge "Activated text should be white. Shares resources with gmail." into ics-mr1
* commit 'aff4bdac07041ec3bbdedda09390b01f07c61e1b':
  Activated text should be white. Shares resources with gmail.
2011-11-09 21:19:26 +00:00
Mindy Pereira
626c289977 am 4beab88c: Share font colors and sizes with gmail.
* commit '4beab88c92226628bf743070f88affb701968ce0':
  Share font colors and sizes with gmail.
2011-11-09 21:19:25 +00:00
Mindy Pereira
d48112432e am e813f733: Merge "Fixup quoted text styling." into ics-mr1
* commit 'e813f733609208798d5f3c6820ded8876961d1f3':
  Fixup quoted text styling.
2011-11-09 21:19:24 +00:00
Mindy Pereira
0ee798579c am 21e4fe49: Share background styles with gmail.
* commit '21e4fe49b68738523ebdc8c340469a46d79ed691':
  Share background styles with gmail.
2011-11-09 21:19:24 +00:00
Mindy Pereira
cc9845e86e Make sure we show/ hide all quoted text views.
Leftover part of b/5517524 compose on tablets needs redline

Change-Id: I73aabb7ad02a64aa9413cdf7a0ea8f147fa2994f
2011-11-08 16:52:28 -08:00
Marc Blank
cb440142ba Merge "Up version number for release" into ics-mr1 2011-11-08 16:46:47 -08:00
Marc Blank
00099da1b3 Merge "Make EAS Email syncable after GB/HC -> ICS upgrade" into ics-mr1 2011-11-08 16:46:41 -08:00
Mindy Pereira
aff4bdac07 Merge "Activated text should be white. Shares resources with gmail." into ics-mr1 2011-11-08 16:34:46 -08:00
Mindy Pereira
fde8089157 Activated text should be white. Shares resources with gmail.
part of b/5520533 activated text should be white

Change-Id: Ia6f79bed2277185eca100bd6c65884a2cd574e22
2011-11-08 16:15:12 -08:00
Marc Blank
bec52108cd Up version number for release
* For ICS-MR1, v4.1

Bug: 5392464
Change-Id: I9666c91a5fde5040ee44c51dc7deae10583a8575
2011-11-08 15:47:54 -08:00
Mindy Pereira
4beab88c92 Share font colors and sizes with gmail.
part of b/5520048 unread/ read contrast is bad for conversation list items on tablet

Change-Id: I06d0d560ce32714afe9229d1e009b9b09dc11df8
2011-11-08 13:02:22 -08:00
Mindy Pereira
e813f73360 Merge "Fixup quoted text styling." into ics-mr1 2011-11-08 11:26:53 -08:00
Mindy Pereira
21e4fe49b6 Share background styles with gmail.
Part of b/5520048 unread/ read contrast is bad for conversation list items on tablet

Change-Id: I0a5848852b15ead11bef3d56a2c1e1b324f6da73
2011-11-08 09:46:59 -08:00
Marc Blank
8ff1842ab1 Make EAS Email syncable after GB/HC -> ICS upgrade
* In the same upgrade step in which we add AccountManager accounts
  to IMAP/POP accounts, we now make Email syncable for EAS accounts
* This step is hit by all users upgrading from GB/HC -> ICS

Bug: 5582884

Change-Id: I11a06e2ad72ffed20c31f5d8be81705642f552a5
2011-11-08 09:16:15 -08:00
Eric Fischer
c8b03bb9c3 am 610289bc: (-s ours) Import revised translations. DO NOT MERGE
* commit '610289bcc250840510c2f3f7bb52c9842dcebcc0':
  Import revised translations.  DO NOT MERGE
2011-11-07 20:41:01 +00:00
Eric Fischer
610289bcc2 Import revised translations. DO NOT MERGE
Change-Id: Ifd8f33e61f562ce969da1c5a3d77947e9dfc07e7
2011-11-07 12:26:12 -08:00
The Android Open Source Project
764727dc86 Reconcile with ics-mr1-release
Change-Id: Icdf350ddcb3cd1de725e455fd7ef8f4bba669425
2011-11-07 08:31:55 -08:00
The Android Automerger
446d81b0d4 merge in ics-mr1-release history after reset to ics-mr1 2011-11-06 06:46:35 -08:00
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