Commit Graph

6478 Commits

Author SHA1 Message Date
The Android Open Source Project
b42c1fd67e Reconcile with ics-mr1-release
Change-Id: I62f7aa19d71ace68216a5c595325c0b76b1f99ff
2012-02-01 08:50:33 -08:00
The Android Automerger
8570b771c8 merge in ics-mr1-release history after reset to ics-mr1 2012-01-26 18:32:12 -08:00
Marc Blank
ecaa977413 If we're stopped, make sure watchdog alarm is also stopped
Bug: 5647625
Change-Id: I33e94107f2d6e4a38a5a221df72ed83596ca7c54
2012-01-25 14:59:54 -08:00
The Android Automerger
0cab48f73b merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:29:28 -08:00
Paul Westbrook
07676012f7 Fix widget updates
Fix widgets that stop updating.  If the Launcher got killed, the Email
widget service gets unbound.  When this happens the cursor loader for the
widget is stopped.  Since widget is relying on the loader to update the data,
when the loader is stopped, the widget would never update.

Now when email recognizes a change, it will send a broadcast intent, which
will cause the widget service to be started, if it isn't.

Bug: 5811810
Change-Id: Ia840e58f10e780b94440119662c2e48e7785c507
2012-01-09 13:14:47 -08:00
The Android Automerger
68e2e770f4 merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:42:42 -08:00
Marc Blank
9b4240f7c5 DO NOT MERGE: Handle UI part of email lookback limit
Bug: 5792217
Change-Id: Iccd6b1db30e8fb1fbdb514ed2de6d1e789a6280a
2012-01-04 11:51:08 -08:00
The Android Automerger
e8949d30bc merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 17:35:48 -08:00
Mindy Pereira
6d7eef22cd DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
Fixes b/5716835 back stack in email gets messed up in certain circumstances

Change-Id: I499a1c19f1ebbb7e4debde690cacf17f9f6c3454
2011-12-08 13:47:02 -08:00
Eric Fischer
0130c5a037 Import revised translations. DO NOT MERGE
Change-Id: I0b065eb88500457583eedf899db1c76ef939dbab
2011-12-08 10:34:54 -08:00
The Android Automerger
0fe9c4a616 merge in ics-mr1-release history after reset to ics-mr1 2011-12-06 16:54:41 -08:00
Eric Fischer
844b1556b1 Import revised translations. DO NOT MERGE
Change-Id: I1a328a978d6968242ed48871c636a8000fb7ffb9
2011-12-06 10:28:50 -08:00
The Android Automerger
57b399860d merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 06:46:38 -08:00
Mindy Pereira
58253012a0 DO NOT MERGE Fix message list width and margins
Fixes b/5691557 Email tablet split view convo list text alignment has regressed

Change-Id: I031b35580c8715768719e7ea8a2685eb6aed3d31
2011-11-30 16:57:01 -08:00
The Android Automerger
43a086d857 merge in ics-mr1-release history after reset to ics-mr1 2011-11-30 06:46:40 -08:00
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
702d2e2bfd Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-29 13:26:50 -08:00
Eric Fischer
cbf700f85b Import revised translations. DO NOT MERGE
Change-Id: I238d3246e725ddfa38c2b53d842c7e97c2d00bf8
2011-11-29 13:15:11 -08:00
Jeff Brown
d462ae95e4 Add application launch category.
Bug: 5674723
Change-Id: I8eb030c9bdc29769b7a3c7e3ca383d29c0a0ebdb
2011-11-28 20:11:53 -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
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
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
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
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
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
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
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
fc152d63a8 Merge commit '5fc56ecd' into nov15-conflicts 2011-11-15 12:21:32 -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
Mindy Pereira
a91aff9656 Merge "Revert "Dont take density into account when setting initial zoom values."" into ics-mr1 2011-11-15 09:54:05 -08:00
Mindy Pereira
6599af1357 Revert "Dont take density into account when setting initial zoom values."
This reverts commit e103e90fa1
2011-11-15 09:50:43 -08:00
Marc Blank
7fd8ebef9f Merge "Reduce max in-memory size of IMAP text from 16MB to 2MB" into ics-mr1 2011-11-15 08:24:02 -08:00
The Android Automerger
b67b367d55 merge in ics-mr1-release history after reset to ics-mr1 2011-11-15 06:46:29 -08:00
Mindy Pereira
8b30d335c1 Merge "Highlight the first result for search." into ics-mr1 2011-11-14 21:52:37 -08:00
RoboErik
d39cf1938a b/5613906 Don't show account picker for 0 or 1 account
This hides the activity when dropping an email widget until we
get some data back and can decide which picker to show.

Change-Id: I200b035a45d079285d1b84b273ddd7ce2ffda24c
2011-11-14 17:21:10 -08:00
Marc Blank
dceb2884ea Reduce max in-memory size of IMAP text from 16MB to 2MB
* Even 2MB is probably high, but it's far better than 16MB

Bug: 5573863
Change-Id: I00d6d84ebc538d41dbf5683bd078a6bcd802e584
2011-11-14 16:53:48 -08:00
Mindy Pereira
572491c36c Don't set freezeText for the unread count for the email widget.
fixes b/5608267 Widget count flickers in email widget

Change-Id: I76fb8fc04bc016770757ac0c7d7c3e2e66e6c3ad
2011-11-14 13:47:39 -08:00
Eric Fischer
5fc56ecd05 Import revised translations. DO NOT MERGE
Change-Id: Ia146e9247e925a1d11e925ff3de555dcd03ee04f
2011-11-14 13:32:45 -08:00
Mindy Pereira
bed1b4fa7a Highlight the first result for search.
Fixes b/5614128 Email doesn't auto display first search result after result list appears

Change-Id: I1843471bc3fe018151ed2a30ceb3e19eb2af24e9
2011-11-14 13:30:35 -08:00
Mindy Pereira
e103e90fa1 Dont take density into account when setting initial zoom values.
WebView takes screen density into account when setting the initial
webview zoom value as of cl:
https://android-git.corp.google.com/g/#/c/146916/

Fixes b/5593688 Message text size is set to Large in Email

Change-Id: I442eb91c825a7ad7a42d3d2772b625c662df6ec1
2011-11-14 11:16:35 -08:00
The Android Automerger
1af578fee0 merge in ics-mr1-release history after reset to ics-mr1 2011-11-13 06:47:14 -08:00
Mindy Pereira
30fd3107c4 Merge "Make the dropdown width larger/ matching Gmail." into ics-mr1 2011-11-11 11:14:12 -08:00