Commit Graph

6515 Commits

Author SHA1 Message Date
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
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
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
dbd8c443df 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:51:22 -08:00
Mindy Pereira
7c9c70c944 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:51:22 -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
c31736c0d7 am af637589: Fix typo in CL; sigh
* commit 'af6375894fe4b405f205a22a7ee9118a36fef428':
  Fix typo in CL; sigh
2011-11-11 15:13:50 +00:00
Makoto Onuki
070277d9fc 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 15:13:50 +00: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
2764af4269 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:30:56 +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
Eric Fischer
a3b1306907 Merge "Import revised translations." 2011-11-10 15:01:39 -08:00
The Android Open Source Project
351a812f6c Reconcile with ics-mr1-release
Change-Id: If0c89a22be6f314525272dfd7e706004a5c7adb8
2011-11-10 14:36:27 -08:00
Eric Fischer
f50e5f5b59 Import revised translations.
Change-Id: If6d482d1cfedad381cbf56aa6dd1be88ed0beb8b
2011-11-10 14:11:02 -08:00
Eric Fischer
488f7e8593 am 1b04f023: (-s ours) am b1e0455c: (-s ours) Import revised translations. DO NOT MERGE
* commit '1b04f02300bedeb89416d1da731d205d4bfa5664':
  Import revised translations.  DO NOT MERGE
2011-11-10 16:15:04 +00:00
Mindy Pereira
4ce8274b86 am 69fc89b1: Merge "The quick contact should only open when the usr taps the photo." into ics-mr1
* commit '69fc89b118f1da9bb97b3a2c8284bf9f70f7e844':
  The quick contact should only open when the usr taps the photo.
2011-11-10 16:14:58 +00:00
Minh Pham
c40ccf4cc9 am e7ee5bd6: Fix search UI
* commit 'e7ee5bd608b44b123cca12a9f198118927a838c7':
  Fix search UI
2011-11-10 16:14:46 +00:00
The Android Automerger
1334e399a6 merge in ics-mr1-release history after reset to ics-mr1 2011-11-10 06:47:08 -08:00
Mindy Pereira
00d30012b8 am dbfcbd75: Vertically center checkboxes for phones with first line of subject.
* commit 'dbfcbd75412689179f8a3e0fdc5f714bc348877a':
  Vertically center checkboxes for phones with first line of subject.
2011-11-10 05:42:58 +00:00
Mindy Pereira
a691809c3a am 6de1470b: Merge "Tighten up label list on crespo so we can fit more on the smaller screen." into ics-mr1
* commit '6de1470bd88e75ba292633394ad3559438a3fc25':
  Tighten up label list on crespo so we can fit more on the smaller screen.
2011-11-10 05:42:54 +00: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
1b04f02300 am b1e0455c: (-s ours) Import revised translations. DO NOT MERGE
* commit 'b1e0455cc970a09e093e6bde1a0cf50b53cea627':
  Import revised translations.  DO NOT MERGE
2011-11-09 23:18:06 +00:00
Mindy Pereira
69fc89b118 Merge "The quick contact should only open when the usr taps the photo." into ics-mr1 2011-11-09 15:04:41 -08:00
Mindy Pereira
81d234aa8c am cc9845e8: Make sure we show/ hide all quoted text views.
* commit 'cc9845e86ef500b4e4c65c141cac45f88d426696':
  Make sure we show/ hide all quoted text views.
2011-11-09 21:19:27 +00:00
Marc Blank
f17731a1ba am cb440142: Merge "Up version number for release" into ics-mr1
* commit 'cb440142baa5809d896c6e4e3aeaa6c26b033049':
  Up version number for release
2011-11-09 21:19:27 +00:00
Marc Blank
406641ce09 am 00099da1: Merge "Make EAS Email syncable after GB/HC -> ICS upgrade" into ics-mr1
* commit '00099da1b3b9d91574187e70182e5384debb3731':
  Make EAS Email syncable after GB/HC -> ICS upgrade
2011-11-09 21:19:26 +00:00
Mindy Pereira
8a90477033 am aff4bdac: Merge "Activated text should be white. Shares resources with gmail." into ics-mr1
* commit 'aff4bdac07041ec3bbdedda09390b01f07c61e1b':
  Activated text should be white. Shares resources with gmail.
2011-11-09 21:19:26 +00:00