Commit Graph

6606 Commits

Author SHA1 Message Date
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
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
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
d5109cf7f0 Use static library resources from chips.
Change-Id: I4261004dda1bd106d0c0ad0aec8348920ffd8c7e
2011-12-15 14:01:22 -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
76df3996ee am 163d3521: Reconcile with ics-mr1-release
* commit '163d3521fb8d30c88e682f48bf9f055adeb566cd':
2011-12-12 15:30:01 -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
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
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
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
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
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
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
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
Claudia de Veaux
886acf7420 Merge "Edit to strings per UI text standards." 2011-12-07 14:36:01 -08:00
Claudia de Veaux
76e273e3c8 Edit to strings per UI text standards.
* Used standard language ("Allows this app..." for permission descriptions.
* Messages and toasts use ending punctuation.
* Checkbox labels do not use ending punctuation.
* Toast language should be cryptic.
* Use "unsuccessful" instead of failed, or "Couldn\'t ...".
* Use contractions.

Bug: 5165745
Bug: 5162667
Bug: 5163232
Change-Id: I4417a4c7b06b278ceb2a61f61493842c9bf922e1
2011-12-07 11:50:44 -08:00
The Android Open Source Project
f9da02a503 Reconcile with ics-mr1-release
Change-Id: Ice5b782571d079b6a70acba24a504e5489ba4d55
2011-12-07 07:44:53 -08:00
The Android Automerger
0fe9c4a616 merge in ics-mr1-release history after reset to ics-mr1 2011-12-06 16:54:41 -08:00
Eric Fischer
dafb73e3f4 am 844b1556: (-s ours) Import revised translations. DO NOT MERGE
* commit '844b1556b1de89a23e019be6a7fb7da3b09db867':
  Import revised translations.  DO NOT MERGE
2011-12-06 10:42:34 -08:00
Eric Fischer
844b1556b1 Import revised translations. DO NOT MERGE
Change-Id: I1a328a978d6968242ed48871c636a8000fb7ffb9
2011-12-06 10:28:50 -08:00
Mindy Pereira
50bf710937 Merge "Like Gmail, we only want to set activated text to a diff color for two pane." 2011-12-02 14:27:23 -08:00
Mindy Pereira
bb86a95acd Like Gmail, we only want to set activated text to a diff color for two pane.
Fixes b/5699511 Draft message is showing in white color text

Change-Id: I9f15807936db8864a1752d56056b08ddfb32f121
2011-12-02 14:20:46 -08:00
Mindy Pereira
333cdbaef4 Tweak padding slightly to match the EditTextPreference screens.
The edittextpreference uses a default system screens, but since this isn't really a preference
screen, it isn't usable here.

Change-Id: I770c12a5ec3a33906f5d6d1c9d0b7a6b027460da
2011-12-02 11:36:34 -08:00
Mindy Pereira
dc931441d8 Merge "Fix layout for edit quick response dialog." 2011-12-02 11:14:22 -08:00
Mindy Pereira
d637dc245b Fix layout for edit quick response dialog.
Fixes b/5528659 Quick Response "create new" dialog is janky

Change-Id: Ib78d677114f9af1969ce8314e6f58002d2ad727f
2011-12-02 11:11:21 -08:00
Mindy Pereira
bc6625ef73 Merge "Make sure to check for a null account before using the account." 2011-12-02 10:44:21 -08:00
Mindy Pereira
ceca4751b2 Make sure to check for a null account before using the account.
This is a common root cause with monkey crashes.

Fixes b/5628984 com.google.android.email: java.lang.NullPointerException: Unable to start activity ComponentInfo{com.google.android.email/com.android.email.activity.setup.AccountSetupIncoming}: java.lang.NullPointerExceptionat android.app.ActivityThread.performLaunchActivity(ActivityThread.java:1955)

Change-Id: Ib3ac5c62b72662402c7d5df4e5d895beaf324197
2011-12-02 10:30:13 -08:00
Vikram Aggarwal
3714243c0d Merge "Consolidate Preference.OnPreferenceChangeListener objects in AccountSettingsFragment" 2011-12-02 10:14:32 -08:00
Vikram Aggarwal
4016ea1ae9 Consolidate Preference.OnPreferenceChangeListener objects in AccountSettingsFragment
Fixes b/5642876

Change-Id: I74b9e06107ea89d7b3acf74c6c676dcc85125abc
2011-12-02 09:53:39 -08:00
The Android Open Source Project
aff36f0535 Reconcile with ics-mr1-release
Change-Id: I0313fc0c1df083bb5498f99ef14d5da6f8320c5e
2011-12-02 07:53:35 -08:00
Mindy Pereira
377a4ff7fe Merge "Fix message list width and margins" 2011-12-01 07:56:07 -08:00
The Android Automerger
57b399860d merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 06:46:38 -08:00
Mindy Pereira
3a1a5d2c31 am 58253012: (-s ours) DO NOT MERGE Fix message list width and margins
* commit '58253012a08c03bd2acd6a172adf89c665996944':
  DO NOT MERGE Fix message list width and margins
2011-11-30 23:47:37 -08:00
Mindy Pereira
58253012a0 DO NOT MERGE Fix message list width and margins
Fixes b/5691557 Email tablet split view convo list text alignment has regressed

Change-Id: I031b35580c8715768719e7ea8a2685eb6aed3d31
2011-11-30 16:57:01 -08:00
Mindy Pereira
29738358a9 Fix message list width and margins
Fixes b/5691557 Email tablet split view convo list text alignment has regressed

Change-Id: Ia00ef382bb7b7879c4535b4571acbdb4e6ac2dd4
2011-11-30 16:42:56 -08:00
The Android Open Source Project
d039dc9a5d Reconcile with ics-mr1-release
Change-Id: I80e01f57f3e71b736ccb9d0db7aa4597b2009ced
2011-11-30 12:56:13 -08:00
Minh Pham
fba2dbb35b am 16439d5e: Fix date margin
* commit '16439d5e23ea4a4bb86e7f4d23a473525e043007':
  Fix date margin
2011-11-30 10:50:53 -08:00
The Android Automerger
43a086d857 merge in ics-mr1-release history after reset to ics-mr1 2011-11-30 06:46:40 -08:00