Minh Pham
16439d5e23
Fix date margin
...
- Use a specific margin for date in normal mode.
Bug: 5685616
Change-Id: I38843b66e8e2cbc077f2d7421a4e1cb86b274dc5
2011-11-29 17:40:12 -08:00
Eric Fischer
4c2b8d3a4c
am 702d2e2b
: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '702d2e2bfdb2bb0147d5846c8ce8ac62d091797c':
Import revised translations. DO NOT MERGE
2011-11-29 13:30:40 -08:00
Eric Fischer
702d2e2bfd
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-29 13:26:50 -08:00
Jeff Brown
2b08112df4
am d462ae95
: Add application launch category.
...
* commit 'd462ae95e4b3012e562d5644389a62a43efe8435':
Add application launch category.
2011-11-29 13:20:08 -08:00
Eric Fischer
cbf700f85b
Import revised translations. DO NOT MERGE
...
Change-Id: I238d3246e725ddfa38c2b53d842c7e97c2d00bf8
2011-11-29 13:15:11 -08:00
Eric Fischer
d28bbceac9
Merge "Import revised translations."
2011-11-29 11:07:46 -08:00
Eric Fischer
7a52f832cc
Import revised translations.
...
Change-Id: I6f7573020c772af80589c7f60f0f2bd079ef20d2
2011-11-29 10:57:31 -08:00
Mindy Pereira
e18e8f45da
Merge "Show correct error when adding widget with no email accts on device."
2011-11-29 09:35:34 -08:00
Jeff Brown
d462ae95e4
Add application launch category.
...
Bug: 5674723
Change-Id: I8eb030c9bdc29769b7a3c7e3ca383d29c0a0ebdb
2011-11-28 20:11:53 -08:00
Mindy Pereira
30003e582f
Show correct error when adding widget with no email accts on device.
...
If the WidgetConfiguration service is disabled until the user adds an account,
adding the widget just fails badly as there is no service registered
to handed an APPWIDGET_CONFIGURE intent.
Fixes b/5613821 App isn't installed toast message when creating widget for Email without any account
Change-Id: I98003eadf71fb944d3c0902f7e132ca7c5b67571
2011-11-28 16:30:12 -08:00
The Android Automerger
572166ddf0
merge in ics-mr1-release history after reset to ics-mr1
2011-11-28 12:22:53 -08:00
Mindy Pereira
ac96f64081
Merge "Check for account before launching welcome screen."
2011-11-28 11:35:07 -08:00
Mindy Pereira
fe402a8081
Check for account before launching welcome screen.
...
If this is running via monkey, might not have an account yet.
fixes b/5518958 java.lang.NullPointerException at com.android.email.activity.MessageCompose.onBack(MessageCompose.java:1797)
Change-Id: I17fb606a2fd3aad685a855ae8bd9eda551296ca3
2011-11-28 11:26:03 -08:00
Mindy Pereira
d767a7625f
Fixup wait activity screen to look like Gmail.
...
Fixes b/5642479 "Waiting for sync" in ugly font
Change-Id: I61ea9b296eb7f64c80f8992c77724fc02a978d38
2011-11-28 11:04:54 -08:00
The Android Open Source Project
87dde96eaf
Reconcile with ics-mr1-release
...
Change-Id: I9f6ebf6661626efa2a398e362eb1f172e253f16c
2011-11-22 13:26:11 -08:00
The Android Automerger
7d5655758e
merge in ics-mr1-release history after reset to ics-mr1
2011-11-22 11:56:41 -08:00
Eric Fischer
0408c1c598
am fb675952
: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'fb675952572431929e543f9f4d72117a682e7ba8':
Import revised translations. DO NOT MERGE
2011-11-21 21:08:12 -08:00
Eric Fischer
fb67595257
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-21 15:26:35 -08:00
Eric Fischer
208346aaf5
Import revised translations. DO NOT MERGE
...
Change-Id: I2b7089ceb301e014b44a702a20fb2ccf0fd31574
2011-11-21 14:58:32 -08:00
Marc Blank
fd81e19779
Don't save Policy with Account
...
Change-Id: Ib3601daee8780640a07db573f623e99279c9f9b1
2011-11-21 13:04:26 -08:00
Mindy Pereira
5789a78af3
Merge "Add account should be shown on all Email prefs screens and subscreens on tablet."
2011-11-18 15:43:25 -08:00
Mindy Pereira
f579eb8ac3
Add account should be shown on all Email prefs screens and subscreens on tablet.
...
For phone, should match Gmail and just show it at the top level.
Fixes b/5621803 "Add account" button disappeared - IKXEVERESTLTE-3051
Change-Id: I143043485cbb912023fe015a768c6f37c8cad3f5
2011-11-18 15:25:36 -08:00
Vikram Aggarwal
8957df83d4
am dd4f501b
: Merge "Accurately update the preference summary string when changing the vibrate setting." into ics-mr1
...
* commit 'dd4f501b44e1f15f8ba33488a63d0d4731e93317':
Accurately update the preference summary string when changing the vibrate setting.
2011-11-18 15:23:09 -08:00
Mindy Pereira
e8c06cffea
am d22cf7bd
: (-s ours) Merge "DO NOT MERGE ListView eill always show dividers below items if all items in the adapter are enabled." into ics-mr1
...
* commit 'd22cf7bda7018f7040d21b0ea5c81ca8af038fc8':
DO NOT MERGE ListView eill always show dividers below items if all items in the adapter are enabled.
2011-11-18 15:23:08 -08:00
Mindy Pereira
7a7f544c0c
am 9eeb535f
: Merge "Make message items aware of the various modes." into ics-mr1
...
* commit '9eeb535f6f8d940447755a0a31f7b0cc805b1028':
Make message items aware of the various modes.
2011-11-18 15:23:08 -08:00
Vikram Aggarwal
dd4f501b44
Merge "Accurately update the preference summary string when changing the vibrate setting." into ics-mr1
2011-11-18 12:52:18 -08:00
Mindy Pereira
d22cf7bda7
Merge "DO NOT MERGE ListView eill always show dividers below items if all items in the adapter are enabled." into ics-mr1
2011-11-18 12:13:16 -08:00
Mindy Pereira
9eeb535f6f
Merge "Make message items aware of the various modes." into ics-mr1
2011-11-18 12:05:39 -08:00
Vikram Aggarwal
7d28a1c279
Accurately update the preference summary string when changing the
...
vibrate setting.
Fix b/5639748
Change-Id: Ice6d4770c156104495d476826a636487f4df5f1b
2011-11-18 11:14:11 -08:00
Mindy Pereira
e4202e782c
Make message items aware of the various modes.
...
On two pane tablet in portrait mode, the message list items may not
be wide enough to be considered "WIDE_MODE", however, when they are shown
in the message list mode, they should ALWAYS use message list mode backgrounds.
Fixes b/5641014 email portrait: missing the vertical divider between folders and messages
Change-Id: Ied05386f1ab62c48b1824647c95a6f72baabc859
2011-11-18 09:26:49 -08:00
Mindy Pereira
8579139473
DO NOT MERGE ListView eill always show dividers below items if all items in the adapter are enabled.
...
It seems like it should not show a divider on the last item when there are headers
OR infer not all items enabled when there are headers, but it doesn't.
Fixes b/5517092 extra divider line between last label and next header in label list
Change-Id: I3f70bbf0d33883df4c60596411481504f627f350
2011-11-17 16:57:59 -08:00
Mindy Pereira
6fc728b7cd
ListView eill always show dividers below items if all items in the adapter are enabled.
...
It seems like it should not show a divider on the last item when there are headers
OR infer not all items enabled when there are headers, but it doesn't.
Fixes b/5517092 extra divider line between last label and next header in label list
Change-Id: Ib0f0361e672edcc36c973166c062b67e61ec59c4
2011-11-17 16:31:09 -08:00
The Android Automerger
b665908396
merge in ics-mr1-release history after reset to ics-mr1
2011-11-17 06:47:01 -08:00
Eric Fischer
71834bd91a
am 4802688b
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '4802688b0353744ae9156e89465fe55a245036d2':
Import revised translations. DO NOT MERGE
2011-11-17 05:45:46 -08:00
Eric Fischer
4802688b03
Import revised translations. DO NOT MERGE
...
Change-Id: I16cfe6de6623792dacba1797e50a08ee1dd07702
2011-11-16 10:14:35 -08:00
The Android Automerger
744214b812
merge in ics-mr1-release history after reset to ics-mr1
2011-11-16 06:46:45 -08:00
Marc Blank
db3dc58fce
am bcadbc5f
: Merge "Fix ICS setup regression" into ics-mr1
...
* commit 'bcadbc5fce10278f1a557a876ebf0eb60afdf051':
Fix ICS setup regression
2011-11-15 18:25:11 -08:00
Marc Blank
bcadbc5fce
Merge "Fix ICS setup regression" into ics-mr1
2011-11-15 16:12:02 -08:00
Marc Blank
c196e05ee1
Fix ICS setup regression
...
Bug: 5612276
Change-Id: Ic9ab3cb075be7ff4e0e5138a453a71cfcbe655b5
2011-11-15 16:07:50 -08:00
Vikram Aggarwal
5117621aab
am fb9c860a
: Remove hard-coded references to zoom values and set them as resource arrays instead.
...
* commit 'fb9c860ae2fafffd95931ded199e8c07ed3831bb':
Remove hard-coded references to zoom values and set them as resource arrays instead.
2011-11-15 14:31:54 -08:00
Vikram Aggarwal
fb9c860ae2
Remove hard-coded references to zoom values and set them as resource arrays instead.
...
Change-Id: I2af4bad3611a6f5c1580980d6ccee25910085f84
2011-11-15 14:05:18 -08:00
Eric Fischer
23ed376c27
am fc152d63
: Merge commit \'5fc56ecd\' into nov15-conflicts
...
* commit 'fc152d63a8325724a0c2b0edf0da9bc9e4405b06':
Import revised translations. DO NOT MERGE
2011-11-15 13:11:10 -08:00
RoboErik
e6772f7c75
am 438a54a9
: Merge "b/5613906 Don\'t show account picker for 0 or 1 account" into ics-mr1
...
* commit '438a54a9007b49793930acbbe41d2283e1d9cd4b':
b/5613906 Don't show account picker for 0 or 1 account
2011-11-15 13:07:16 -08:00
Mindy Pereira
7d0d51e981
am a91aff96
: Merge "Revert "Dont take density into account when setting initial zoom values."" into ics-mr1
...
* commit 'a91aff96565ddb2b52700427303478f0ef3b660b':
Revert "Dont take density into account when setting initial zoom values."
2011-11-15 13:07:10 -08:00
Marc Blank
e285f7da80
am 7fd8ebef
: Merge "Reduce max in-memory size of IMAP text from 16MB to 2MB" into ics-mr1
...
* commit '7fd8ebef9f65eac8f1e1e21c8fe1f94e069cbbdd':
Reduce max in-memory size of IMAP text from 16MB to 2MB
2011-11-15 13:06:56 -08:00
Eric Fischer
fc152d63a8
Merge commit '5fc56ecd' into nov15-conflicts
2011-11-15 12:21:32 -08:00
Mindy Pereira
c2b4b68a41
am 8b30d335
: Merge "Highlight the first result for search." into ics-mr1
...
* commit '8b30d335c1d2abe9e7ee79f97b834fdcb7a2c9c3':
Highlight the first result for search.
2011-11-15 11:30:29 -08:00
Mindy Pereira
0e070caf61
am 572491c3
: Don\'t set freezeText for the unread count for the email widget.
...
* commit '572491c36c318dab4888fd39280d618b896636ee':
Don't set freezeText for the unread count for the email widget.
2011-11-15 11:30:28 -08:00
Mindy Pereira
42cc693ccd
am e103e90f
: Dont take density into account when setting initial zoom values.
...
* commit 'e103e90fa1fe7c440a99d3f5484adc45097f3caa':
Dont take density into account when setting initial zoom values.
2011-11-15 11:30:27 -08:00
RoboErik
438a54a900
Merge "b/5613906 Don't show account picker for 0 or 1 account" into ics-mr1
2011-11-15 10:05:03 -08:00