The Android Automerger
7a8724e4d8
merge in ics-mr1-release history after reset to ics-mr1
2011-11-02 06:46:33 -07: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
f4d30527c4
Merge "Create a require manual sync dialog." into ics-mr1
2011-11-01 16:51:37 -07: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
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
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
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
The Android Automerger
db4ad61ffb
merge in ics-mr1-release history after reset to ics-mr1
2011-10-30 06:47:39 -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
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
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
Eric Fischer
152ab4dfd2
Import revised translations. DO NOT MERGE
...
Change-Id: Ie75200d19bcc3cb267351a24a47c595465537f41
2011-10-26 10:21:07 -07:00
The Android Automerger
dd05a04499
merge in ics-mr1-release history after reset to ics-mr1
2011-10-26 07:05:32 -07:00
Ed Heyl
565b4ce99a
merge ics-mr0
...
Change-Id: I83fecd4af7a696e44aa6e7ec17afc390ff61b941
2011-10-25 20:16:55 +00:00
Eric Fischer
017b062b18
Import revised translations. DO NOT MERGE
...
Change-Id: I5a3d8ce3b33cfbc3756bdcefa599e4c75f335df6
2011-10-24 16:49:50 -07:00
The Android Automerger
592b9b818c
merge in ics-release history after reset to master
2011-10-23 07:02:04 -07:00
Marc Blank
6629f6b67c
Merge "onMove in CachedCursor shouldn't call the underlying cursor's method"
2011-10-21 17:57:52 -07:00
Eric Fischer
51de134069
am 26e92897
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '26e928971c432e4462136e67ee1dae328306f9d6':
Import revised translations. DO NOT MERGE
2011-10-21 16:02:27 -07:00
Ben Komalo
037e00b97d
Merge "Disable widget creation if there're no accounts"
2011-10-21 14:53:23 -07:00
Ben Komalo
ee8b4cf7ff
Merge "Make Email widget more accessible."
2011-10-21 14:52:51 -07:00
Ben Komalo
d94522c6d9
Make Email widget more accessible.
...
Bug: 5480096
Change-Id: I58fe6bd070c7d8058f2a920012c3260bfed614b9
2011-10-21 14:50:42 -07:00
Eric Fischer
26e928971c
Import revised translations. DO NOT MERGE
...
Change-Id: Ic07cf6a78fdead82547796bfae87288c4cfd3627
2011-10-21 14:38:48 -07:00
Eric Fischer
a8eb9c462d
am 805aca21
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '805aca21ec16b744feb2939167955153cbf9e557':
Import revised translations. DO NOT MERGE
2011-10-21 13:59:14 -07:00
Marc Blank
8919237f34
Merge "Fix findExistingAccount to treat underscore properly"
2011-10-21 11:30:42 -07:00
Ben Komalo
227514c1cf
Remove stale strings in widget.
...
We can't tap to configure anymore, at least not according to the old
method.
Bug: 5451924
Change-Id: I997e96a9bab36aecf68a5daeedff6e7442a848a4
2011-10-21 11:19:34 -07:00
Ben Komalo
7958ce59e6
Unused assets removed from Email
...
Change-Id: I347b733a28deffccdcdc0368fbf87aed71e0d95b
2011-10-21 09:10:27 -07:00
Ben Komalo
1fb0b605e2
Merge "Request focus in field when cc/bcc is toggled."
2011-10-21 08:38:32 -07:00
Ben Komalo
d69fab905d
Prevent insert quick response crash.
...
Monkeys can click really fast, before the data is finished loading.
Bug: 5067086
Change-Id: I7f9248b0fb694a83ecb793570b2a17f91a49ad85
2011-10-21 08:23:26 -07:00
Ben Komalo
ea73911291
Disable widget creation if there're no accounts
...
Bug: 4571798
Change-Id: I4b496c12b6c8a2123f9b3d9e28ecf098ca374a74
2011-10-20 21:43:31 -07:00
Marc Blank
0ff0e155c5
Fix findExistingAccount to treat underscore properly
...
Bug: 2318959
Change-Id: Ia39ed29084dc8111c61ff552fa65519789b7c23a
2011-10-20 18:41:26 -07:00
Eric Fischer
805aca21ec
Import revised translations. DO NOT MERGE
...
Change-Id: Icc57021105a6b95efc34f268e4bf778a75d2de1c
2011-10-20 17:59:44 -07:00
Ben Komalo
2f105a0543
Request focus in field when cc/bcc is toggled.
...
Bug: 3090788
Change-Id: I184dfe586199af9bcb016f60bf97bcd4382b4f73
2011-10-20 17:26:16 -07:00
Ben Komalo
41495761db
Delete stale test.
...
This test has been disabled for over a year. I call it unnecessary and a
burdern at this point.
Bug: 2938323
Change-Id: I98bd67a0ed3bb1b880a5e7b6bcf8c90b8cf2de46
2011-10-20 16:50:38 -07:00
Ben Komalo
705e1244fb
Merge "Fix account creation issues."
2011-10-20 16:49:58 -07:00