Commit Graph

6484 Commits

Author SHA1 Message Date
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
Marc Blank
7585ab712e 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 18:59:12 +00: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
Mindy Pereira
00691e4738 am d59affc5: Merge "Revert "Fix build break"" into ics-mr1
* commit 'd59affc5e6eb5849a91fa990a05943cc59d9ac30':
  Revert "Fix build break"
2011-11-02 00:26:19 +00:00
Mindy Pereira
70f771a7ac 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 00:26:18 +00:00
Mindy Pereira
0054892939 am 565e94cd: Merge "Revert "Create a require manual sync dialog."" into ics-mr1
* commit '565e94cd6d9340183316afbc928d4a9a89c786f2':
  Revert "Create a require manual sync dialog."
2011-11-02 00:26:18 +00: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
50fd724b7d am f4d30527: Merge "Create a require manual sync dialog." into ics-mr1
* commit 'f4d30527c4370dfc3d0c04904fa5c46437848334':
  Create a require manual sync dialog.
2011-11-01 23:52:50 +00:00
Mindy Pereira
f4d30527c4 Merge "Create a require manual sync dialog." into ics-mr1 2011-11-01 16:51:37 -07:00
Marc Blank
b88b61481c am 6f6aee06: Merge "Fix build break" into ics-mr1
* commit '6f6aee06ec97690176d08e80179bbd5ba7d940b8':
  Fix build break
2011-11-01 23:45:01 +00: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
a227b823ff 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-01 22:40:34 +00: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
87cb4234dc am 9f59af95: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '9f59af95a70bbb0099473a17da26157379a8d170':
  Import revised translations.  DO NOT MERGE
2011-11-01 20:55:29 +00: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
Mindy Pereira
4315c63d94 am 32997aa3: New assets for notifications.
* commit '32997aa3746cf11034de583e7e4fd93709dd74c1':
  New assets for notifications.
2011-11-01 18:08:18 +00: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
Ed Heyl
f34921bfe3 Merge remote branch 'goog/ics-mr1' into ics-aah 2011-10-31 05:54:47 -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
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
Ed Heyl
770cfbb135 keep previous history after reset to mr1 plus aah changes (ics-aah-wip) 2011-10-28 19:05:56 +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
Eric Fischer
273c32b363 Import revised translations. DO NOT MERGE
Change-Id: I86833a451b695da00f03444a56b203fb9a1486ad
2011-10-27 09:52:15 -07: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
Ed Heyl
cc8aa26377 undo reset to ics-mr1 until we have a better method 2011-10-26 21:53:26 +00:00
Eric Fischer
f9647fc369 am 152ab4df: (-s ours) Import revised translations. DO NOT MERGE
* commit '152ab4dfd2dbd97de3b96af5c1dcf93ed5b5af2f':
  Import revised translations.  DO NOT MERGE
2011-10-26 21:06:37 +00:00
Ed Heyl
161148d27e reset to ics-mr1, but keep history 2011-10-26 18:50:23 +00:00
Eric Fischer
152ab4dfd2 Import revised translations. DO NOT MERGE
Change-Id: Ie75200d19bcc3cb267351a24a47c595465537f41
2011-10-26 10:21:07 -07:00
Ed Heyl
c1dd93bb17 am 8ed75d86: am 565b4ce9: (-s ours) merge ics-mr0
* commit '8ed75d86b3fa7c399d6387430eeb9e4b66e735fd':
2011-10-26 08:06:12 -07:00
Ed Heyl
8ed75d86b3 am 565b4ce9: (-s ours) merge ics-mr0
* commit '565b4ce99a613c2a60b92f6bf8846d120182077a':
2011-10-26 15:04:41 +00:00
Marc Blank
8284360c60 am ad921d01: Merge "Rewrite of security policy handling and service code"
* commit 'ad921d01ca716e3975f12de1a55b23d5338dd473':
  Rewrite of security policy handling and service code
2011-10-25 14:26:08 -07:00
Marc Blank
ad921d01ca Merge "Rewrite of security policy handling and service code" 2011-10-25 14:24:14 -07:00
Ed Heyl
565b4ce99a merge ics-mr0
Change-Id: I83fecd4af7a696e44aa6e7ec17afc390ff61b941
2011-10-25 20:16:55 +00:00
Eric Fischer
45aa934f6a am 9951117f: Merge "Import revised translations."
* commit '9951117fdbd8c608dae75f8ee4fabd9d245f909c':
  Import revised translations.
2011-10-25 11:47:28 -07:00