Commit Graph

6484 Commits

Author SHA1 Message Date
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
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
Eric Fischer
4ddc0466ae am 4802688b: Import revised translations. DO NOT MERGE
* commit '4802688b0353744ae9156e89465fe55a245036d2':
  Import revised translations.  DO NOT MERGE
2011-11-16 10:55:41 -08:00
Eric Fischer
4802688b03 Import revised translations. DO NOT MERGE
Change-Id: I16cfe6de6623792dacba1797e50a08ee1dd07702
2011-11-16 10:14:35 -08:00
Marc Blank
c3c24994d3 am bcadbc5f: Merge "Fix ICS setup regression" into ics-mr1
* commit 'bcadbc5fce10278f1a557a876ebf0eb60afdf051':
  Fix ICS setup regression
2011-11-15 16:13:29 -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
cc026d2df5 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:28:27 -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
4433e674f0 am fc152d63: Merge commit \'5fc56ecd\' into nov15-conflicts
* commit 'fc152d63a8325724a0c2b0edf0da9bc9e4405b06':
  Import revised translations. DO NOT MERGE
2011-11-15 12:23:16 -08:00
Eric Fischer
fc152d63a8 Merge commit '5fc56ecd' into nov15-conflicts 2011-11-15 12:21:32 -08:00
RoboErik
d70b2aa440 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 10:06:40 -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
57dfa4bbf2 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 09:55:58 -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
ec0e439fcc 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 09:26:01 -08:00
Mindy Pereira
490f627413 am 8b30d335: Merge "Highlight the first result for search." into ics-mr1
* commit '8b30d335c1d2abe9e7ee79f97b834fdcb7a2c9c3':
  Highlight the first result for search.
2011-11-15 09:25:37 -08:00
Mindy Pereira
fbab9c1ed6 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 09:25:36 -08:00
Mindy Pereira
55d47d3395 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 09:25:36 -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
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
Mindy Pereira
72c663a817 am 30fd3107: Merge "Make the dropdown width larger/ matching Gmail." into ics-mr1
* commit '30fd3107c4445b7974e83704bc9dfbce905e654c':
  Make the dropdown width larger/ matching Gmail.
2011-11-11 11:50:44 -08:00
Mindy Pereira
a329e07284 am 8eff05da: Merge "Make account spinner styles match gmail style." into ics-mr1
* commit '8eff05daa877a75229bf98bf57cd1ed647d58b20':
  Make account spinner styles match gmail style.
2011-11-11 11:50:29 -08:00
Marc Blank
1c89fb3bc9 am af637589: Fix typo in CL; sigh
* commit 'af6375894fe4b405f205a22a7ee9118a36fef428':
  Fix typo in CL; sigh
2011-11-11 11:49:54 -08:00
Makoto Onuki
f72afb5221 am 22e4f6b6: Merge "Fix bug 5594054 Crash seen while syncing Exchange" into ics-mr1
* commit '22e4f6b671ab5cfa56fe0aa40df029effcc5a060':
  Fix bug 5594054 Crash seen while syncing Exchange
2011-11-11 11:49:35 -08:00
Mindy Pereira
30fd3107c4 Merge "Make the dropdown width larger/ matching Gmail." into ics-mr1 2011-11-11 11:14:12 -08:00
Mindy Pereira
8eff05daa8 Merge "Make account spinner styles match gmail style." into ics-mr1 2011-11-11 08:31:53 -08:00
Marc Blank
af6375894f Fix typo in CL; sigh
* Facepalm

Bug: 5582884
Change-Id: I060518a4bbb2c08e1abef934c81d72ec4fbcb565
2011-11-10 17:08:54 -08:00
Makoto Onuki
22e4f6b671 Merge "Fix bug 5594054 Crash seen while syncing Exchange" into ics-mr1 2011-11-10 15:47:21 -08:00
Marc Blank
06066f4a3f am de6b6db9: Merge "Don\'t crash in EmailActivity if no accounts exist" into ics-mr1
* commit 'de6b6db9951637147ae4288d386995ac07c87f26':
  Don't crash in EmailActivity if no accounts exist
2011-11-10 23:29:55 +00:00
Marc Blank
de6b6db995 Merge "Don't crash in EmailActivity if no accounts exist" into ics-mr1 2011-11-10 15:27:48 -08:00
Makoto Onuki
c1d9be5dc3 Fix bug 5594054 Crash seen while syncing Exchange
bug 5594054

Change-Id: Id14598c4da66c0f2c78a7c892f653b6cee781f3b
2011-11-10 15:17:46 -08:00
Marc Blank
656ebc2982 Don't crash in EmailActivity if no accounts exist
Bug: 5044497
Change-Id: Ied760ea385015a3c7df0a0d1e68ebc32dc5fb957
2011-11-09 17:39:32 -08:00
Mindy Pereira
1720f82513 Make the dropdown width larger/ matching Gmail.
part of b/5520685 update account switch spinner to match Gmail layout

Change-Id: I727d318f3f10199399b61fc4455e44d302fb8e2f
2011-11-09 16:33:23 -08:00
Mindy Pereira
0730c4fcd0 Make account spinner styles match gmail style.
Fixes b/5520685 update account switch spinner to match Gmail layout
Change-Id: I06c262f16d8629696bb761b005a3728406ccce53
2011-11-09 15:52:12 -08:00
Eric Fischer
ca1a91d1e8 am 1b04f023: am b1e0455c: (-s ours) Import revised translations. DO NOT MERGE
* commit '1b04f02300bedeb89416d1da731d205d4bfa5664':
  Import revised translations.  DO NOT MERGE
2011-11-09 23:20:40 +00:00