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
faaccaed46
am 16439d5e
: Fix date margin
...
* commit '16439d5e23ea4a4bb86e7f4d23a473525e043007':
Fix date margin
2011-11-29 17:50:25 -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
9c2ec13e4a
am 702d2e2b
: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '702d2e2bfdb2bb0147d5846c8ce8ac62d091797c':
Import revised translations. DO NOT MERGE
2011-11-29 14:30:11 -08:00
Jeff Brown
63ef0dd2d1
am d462ae95
: Add application launch category.
...
* commit 'd462ae95e4b3012e562d5644389a62a43efe8435':
Add application launch category.
2011-11-29 14:29:55 -08:00
Eric Fischer
c53c9ef6f8
am 4c2b8d3a
: am 702d2e2b
: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '4c2b8d3a4c63de658b8b66f9dd76ef0f688930d3':
Import revised translations. DO NOT MERGE
2011-11-29 13:33:47 -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
4b42d759cd
am 2b08112d
: am d462ae95
: Add application launch category.
...
* commit '2b08112df42780b1326d05686bf6c44aa5c57aee':
Add application launch category.
2011-11-29 13:22:43 -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
175d4c35ab
am d28bbcea
: Merge "Import revised translations."
...
* commit 'd28bbceac9cdbf8e615cc3ba16c72422432ff6f2':
Import revised translations.
2011-11-29 11:10:54 -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
ba34319cd4
am e18e8f45
: Merge "Show correct error when adding widget with no email accts on device."
...
* commit 'e18e8f45dabc1bbb36f6f4d7541d5cfad4fb691c':
Show correct error when adding widget with no email accts on device.
2011-11-29 09:38:22 -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
ec865cad01
am ac96f640
: Merge "Check for account before launching welcome screen."
...
* commit 'ac96f64081ac5d90815be2529dfedba28a90e4b4':
Check for account before launching welcome screen.
2011-11-28 11:37:39 -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
7210bf71f4
am d767a762
: Fixup wait activity screen to look like Gmail.
...
* commit 'd767a7625ffe7a7aa480f73830264639f8043b6d':
Fixup wait activity screen to look like Gmail.
2011-11-28 11:15:52 -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
ae575fdc98
am 87dde96e
: Reconcile with ics-mr1-release
...
* commit '87dde96eaf234f4e62de3fe1c79c6db8bd55d4a4':
2011-11-22 13:29:35 -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
beb5f84b4c
am 0408c1c5
: am fb675952
: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '0408c1c5984cf9a660d4f586d576608a69a17582':
Import revised translations. DO NOT MERGE
2011-11-21 21:16:18 -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
31729e9514
am fb675952
: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'fb675952572431929e543f9f4d72117a682e7ba8':
Import revised translations. DO NOT MERGE
2011-11-21 15:29:20 -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
c92fb949bf
am fd81e197
: Don\'t save Policy with Account
...
* commit 'fd81e1977954a710cd3630ef3a9ab6aebff1094c':
Don't save Policy with Account
2011-11-21 13:07:09 -08:00
Marc Blank
fd81e19779
Don't save Policy with Account
...
Change-Id: Ib3601daee8780640a07db573f623e99279c9f9b1
2011-11-21 13:04:26 -08:00
Mindy Pereira
2a9ab20e20
am 5789a78a
: Merge "Add account should be shown on all Email prefs screens and subscreens on tablet."
...
* commit '5789a78af324f7e7541334817c6811d3981a21c7':
Add account should be shown on all Email prefs screens and subscreens on tablet.
2011-11-18 15:46:41 -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
Vikram Aggarwal
3273590bc7
am 8957df83
: am dd4f501b
: Merge "Accurately update the preference summary string when changing the vibrate setting." into ics-mr1
...
* commit '8957df83d454dcf9f18450c55fe46302a58a4cb4':
Accurately update the preference summary string when changing the vibrate setting.
2011-11-18 15:27:59 -08:00
Mindy Pereira
63a136937e
am e8c06cff
: 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 'e8c06cffeaa9fa81ed112c613a27c7e29580e78e':
DO NOT MERGE ListView eill always show dividers below items if all items in the adapter are enabled.
2011-11-18 15:27:59 -08:00
Mindy Pereira
ab2692b805
am 7a7f544c
: am 9eeb535f
: Merge "Make message items aware of the various modes." into ics-mr1
...
* commit '7a7f544c0cb7b4aafc64586308d34d1537a4c185':
Make message items aware of the various modes.
2011-11-18 15:27:58 -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
95a947d92d
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 12:54:05 -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
7b83ed5d9c
am d22cf7bd
: 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 12:16:27 -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
a4cad5719e
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 12:08:28 -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