Commit Graph

7195 Commits

Author SHA1 Message Date
Marc Blank
203449721b am df9f6f60: am 93bc609c: (-s ours) am 9b4240f7: DO NOT MERGE: Handle UI part of email lookback limit
* commit 'df9f6f60f4d3c32efd3e7e9e295a74880ea37e93':
  DO NOT MERGE: Handle UI part of email lookback limit
2012-01-04 20:10:40 -08:00
Marc Blank
df9f6f60f4 am 93bc609c: (-s ours) am 9b4240f7: DO NOT MERGE: Handle UI part of email lookback limit
* commit '93bc609c9e2d02b6a0ae8a6f6cf8489336aeb135':
  DO NOT MERGE: Handle UI part of email lookback limit
2012-01-04 20:08:25 -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
93bc609c9e am 9b4240f7: DO NOT MERGE: Handle UI part of email lookback limit
* commit '9b4240f7c5647c2952b050bb74f18eba274f51f8':
  DO NOT MERGE: Handle UI part of email lookback limit
2012-01-04 13:08:01 -08:00
Marc Blank
201cca585d am 9b4240f7: DO NOT MERGE: Handle UI part of email lookback limit
* commit '9b4240f7c5647c2952b050bb74f18eba274f51f8':
  DO NOT MERGE: Handle UI part of email lookback limit
2012-01-04 13:07:57 -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
Eric Fischer
b825876152 am 6dd58344: Import revised translations.
* commit '6dd583445879817f32258dde423f11c804cd7e6b':
  Import revised translations.
2011-12-29 15:00:12 -08:00
Eric Fischer
6dd5834458 Import revised translations.
Change-Id: Ia7c67cf329c73f2f472f6b3cd5677b4ae0ead4c0
2011-12-29 12:10:49 -08:00
Marc Blank
896d5e654a am d85413e9: Merge "Handle UI part of enforcing email lookback limit"
* commit 'd85413e946d19d11a53136780bf1ee255665f371':
  Handle UI part of enforcing email lookback limit
2011-12-22 13:25:10 -08:00
Marc Blank
d85413e946 Merge "Handle UI part of enforcing email lookback limit" 2011-12-22 13:22:50 -08:00
Marc Blank
919e59044b Handle UI part of enforcing email lookback limit
Bug: 5792217
Change-Id: I4351ae4d8505965a32690ecb5e6338765fb3770f
2011-12-21 17:44:59 -08:00
Conley Owens
8ee8d2e5b1 am 037904ad: am e3def6c9: Make TAG field package-private in several classes
* commit '037904adb40d0852eb3d48bcc5fbfd02814d8b66':
  Make TAG field package-private in several classes
2011-12-21 16:56:44 -08:00
Conley Owens
037904adb4 am e3def6c9: Make TAG field package-private in several classes
* commit 'e3def6c9c4294e9f537d499911b792c89bec2b3c':
  Make TAG field package-private in several classes
2011-12-21 16:54:17 -08:00
Conley Owens
e3def6c9c4 Make TAG field package-private in several classes
Specifically, several internal classes.

This makes a little more sense since they are accessed outside of the
class that they are defined in.

In addition, this fixes errors created by proguard when building with
OpenJDK.

Change-Id: If2e2f90558e04e777a0c4dbc2ccd1f6c46dd8228
2011-12-21 12:45:19 -08:00
Conley Owens
8d975a9c46 am 58ce2d0c: Make TAG field package-private in several classes
* commit '58ce2d0c3a1d693825eb3a8cb9c4ea8ea32d6d65':
  Make TAG field package-private in several classes
2011-12-20 13:58:35 -08:00
Conley Owens
58ce2d0c3a Make TAG field package-private in several classes
Specifically, several internal classes.

This makes a little more sense since they are accessed outside of the
class that they are defined in.

In addition, this fixes errors created by proguard when building with
OpenJDK.

Change-Id: If2e2f90558e04e777a0c4dbc2ccd1f6c46dd8228
2011-12-20 11:58:29 -08:00
Mindy Pereira
aa5169500c am d5109cf7: Use static library resources from chips.
* commit 'd5109cf7f08a76efca11e81dfb5f08fcf54c4233':
  Use static library resources from chips.
2011-12-16 07:57:57 -08:00
Mindy Pereira
d5109cf7f0 Use static library resources from chips.
Change-Id: I4261004dda1bd106d0c0ad0aec8348920ffd8c7e
2011-12-15 14:01:22 -08:00
Mindy Pereira
27e128dbb0 am 68c38d11: Increase allowed chars for sync calendar string.
* commit '68c38d119fbc464050ae33861d36932da199f382':
  Increase allowed chars for sync calendar string.
2011-12-13 09:59:25 -08:00
Mindy Pereira
68c38d119f Increase allowed chars for sync calendar string.
Fixes b/5748113 tk_source_broad_ Android_GoogleJob [190999/ - ]-GTT_request character extension

Change-Id: I29ec26a9d2278a0c02f4cc055d8ae55460a8bf22
2011-12-13 09:34:33 -08:00
The Android Open Source Project
16baa1494e am 76df3996: am 163d3521: Reconcile with ics-mr1-release
* commit '76df3996ee3dc5aec6cae88e787c0f70138c064b':
2011-12-12 15:34:53 -08:00
The Android Open Source Project
76df3996ee am 163d3521: Reconcile with ics-mr1-release
* commit '163d3521fb8d30c88e682f48bf9f055adeb566cd':
2011-12-12 15:30:01 -08:00
Mindy Pereira
a56910cca2 am b64944e9: am 82e050db: (-s ours) am 6d7eef22: DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
* commit 'b64944e9d10d8890e1fc6280aee535145d5b0e36':
  DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
2011-12-12 13:38:05 -08:00
Mindy Pereira
b64944e9d1 am 82e050db: (-s ours) am 6d7eef22: DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
* commit '82e050dbbb0db1fbc02f7abacb9c1e7b7cb03180':
  DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
2011-12-12 12:35:00 -08:00
Eric Fischer
3ca30fdc6e am 3adec178: am c34330bb: (-s ours) am 0130c5a0: Import revised translations. DO NOT MERGE
* commit '3adec178adb95cb6360d21b079b081e9d7b7601b':
  Import revised translations. DO NOT MERGE
2011-12-09 15:03:56 -08:00
The Android Open Source Project
18c1c48065 am 531ad632: am 35353d25: Reconcile with ics-mr1-release
* commit '531ad63238f1c20c62cf8a27fe4501dfd26543cc':
2011-12-09 15:03:55 -08:00
Eric Fischer
3adec178ad am c34330bb: (-s ours) am 0130c5a0: Import revised translations. DO NOT MERGE
* commit 'c34330bb45887b5057145d1c91563fdf89be0fe6':
  Import revised translations. DO NOT MERGE
2011-12-09 14:58:14 -08:00
The Android Open Source Project
531ad63238 am 35353d25: Reconcile with ics-mr1-release
* commit '35353d259849cad1ad204b1b84f1398044b3eeaa':
2011-12-09 14:57:54 -08:00
The Android Open Source Project
163d3521fb Reconcile with ics-mr1-release
Change-Id: I81d29eeea3d099d15968955ccadd8a330c6fbae6
2011-12-09 07:11:37 -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
82e050dbbb am 6d7eef22: DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
* commit '6d7eef22cd2634bd0da8de8e38635dd92b3e5a48':
  DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
2011-12-08 15:33:32 -08:00
Mindy Pereira
6c1214282a am 6d7eef22: DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
* commit '6d7eef22cd2634bd0da8de8e38635dd92b3e5a48':
  DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
2011-12-08 15:32:09 -08:00
Mindy Pereira
0170f3e391 am 2df61456: Clear back stack and make this the top level stack.
* commit '2df61456f4aef692316acbb39b69de4c78a9f8bb':
  Clear back stack and make this the top level stack.
2011-12-08 13:47:30 -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
Andy Huang
d6894cdac9 am a7d1b5c5: Fix various text size problems when system font size is huge
* commit 'a7d1b5c58ce52ed63a935d07d46906a78632ceb6':
  Fix various text size problems when system font size is huge
2011-12-08 13:37:22 -08:00
Mindy Pereira
2df61456f4 Clear back stack and make this the top level stack.
Fixes b/5716835 back stack in email gets messed up in certain circumstances

Change-Id: I6fb593a520931b16e973f025c00709f7e76bb4d9
2011-12-08 13:36:47 -08:00
Andy Huang
a7d1b5c58c Fix various text size problems when system font size is huge
This CL to replace Iafd5d1dc.

* use common styles for spinner anchor and dropdown text
  (introduced in I3063cfea)
* allow dropdown item height to scale beyond fixed height to fit
  huge text

Other fixes:
* use Gmail's color for dropdown and folder list header text
* remove spurious divider in dropdown items that precede a
  header

Bug: 5687252
Change-Id: I3e46cff736a045c4a59a0ff8810977e39f903a14
2011-12-08 13:24:51 -08:00
Eric Fischer
c34330bb45 am 0130c5a0: Import revised translations. DO NOT MERGE
* commit '0130c5a03756b01ec4a39422ab08474625153a81':
  Import revised translations. DO NOT MERGE
2011-12-08 11:13:16 -08:00
Eric Fischer
d957dda20f am 0130c5a0: Import revised translations. DO NOT MERGE
* commit '0130c5a03756b01ec4a39422ab08474625153a81':
  Import revised translations. DO NOT MERGE
2011-12-08 11:13:11 -08:00
Eric Fischer
0130c5a037 Import revised translations. DO NOT MERGE
Change-Id: I0b065eb88500457583eedf899db1c76ef939dbab
2011-12-08 10:34:54 -08:00
The Android Open Source Project
35353d2598 Reconcile with ics-mr1-release
Change-Id: I7fa1d584dcfecb90d259d70546b269118533f00c
2011-12-08 10:22:14 -08:00
Mindy Pereira
12cd9236ba am 970e9b70: Merge "Revert "Fix various text size problems when system font size is huge""
* commit '970e9b70db30e0cb00e101bfb4f346ec8e0bf82e':
  Revert "Fix various text size problems when system font size is huge"
2011-12-08 09:36:31 -08:00
Mindy Pereira
970e9b70db Merge "Revert "Fix various text size problems when system font size is huge"" 2011-12-08 09:35:08 -08:00
Mindy Pereira
c756389817 Revert "Fix various text size problems when system font size is huge"
This reverts commit 19bc1921f2
2011-12-08 09:33:30 -08:00
Vikram Aggarwal
1010b5389f am d8296ff4: Merge "Fix various text size problems when system font size is huge"
* commit 'd8296ff4f2137c1e72324760afc93517350450c2':
  Fix various text size problems when system font size is huge
2011-12-08 09:02:31 -08:00
Vikram Aggarwal
d8296ff4f2 Merge "Fix various text size problems when system font size is huge" 2011-12-08 09:01:12 -08:00
Andy Huang
19bc1921f2 Fix various text size problems when system font size is huge
* use common styles for spinner anchor and dropdown text
  (introduced in I3063cfea)
* allow dropdown item height to scale beyond fixed height to fit
  huge text

Other fixes:
* use Gmail's color for dropdown and folder list header text
* remove spurious divider in dropdown items that precede a
  header

Bug: 5687252
Change-Id: Iafd5d1dc7c3809393c3892138b42b7274fb03a27
2011-12-07 18:28:41 -08:00
Marc Blank
5d9d49f126 am 5c0c5575: Merge "Use LOCALIZED collation for mailbox names"
* commit '5c0c5575676ec73404fa70fc705e3f6476822064':
  Use LOCALIZED collation for mailbox names
2011-12-07 18:02:07 -08:00
Marc Blank
5c0c557567 Merge "Use LOCALIZED collation for mailbox names" 2011-12-07 18:00:27 -08:00
Marc Blank
4c49b4a220 Use LOCALIZED collation for mailbox names
* Our mailbox sort order varies from that of other clients due to
  our not having used LOCALIZED collation

Bug: 2347066
Change-Id: I334feb9fa5690118401e2fe2b4a767eb3f29b25f
2011-12-07 15:05:30 -08:00