ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,580 Commits 2 Branches 0 Tags 45 MiB
886acf7420
Commit Graph

6580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Minh Pham
16439d5e23 Fix date margin 
- Use a specific margin for date in normal mode.
Bug: 5685616

Change-Id: I38843b66e8e2cbc077f2d7421a4e1cb86b274dc5
 2011-11-29 17:40:12 -08:00
Eric Fischer
4c2b8d3a4c am 702d2e2b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '702d2e2bfdb2bb0147d5846c8ce8ac62d091797c':
  Import revised translations.  DO NOT MERGE
 2011-11-29 13:30:40 -08:00
Eric Fischer
702d2e2bfd Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-29 13:26:50 -08:00
Jeff Brown
2b08112df4 am d462ae95: Add application launch category. 
* commit 'd462ae95e4b3012e562d5644389a62a43efe8435':
  Add application launch category.
 2011-11-29 13:20:08 -08:00
Eric Fischer
cbf700f85b Import revised translations. DO NOT MERGE 
Change-Id: I238d3246e725ddfa38c2b53d842c7e97c2d00bf8
 2011-11-29 13:15:11 -08:00
Eric Fischer
d28bbceac9 Merge "Import revised translations." 2011-11-29 11:07:46 -08:00
Eric Fischer
7a52f832cc Import revised translations. 
Change-Id: I6f7573020c772af80589c7f60f0f2bd079ef20d2
 2011-11-29 10:57:31 -08:00
Mindy Pereira
e18e8f45da Merge "Show correct error when adding widget with no email accts on device." 2011-11-29 09:35:34 -08:00
Jeff Brown
d462ae95e4 Add application launch category. 
Bug: 5674723
Change-Id: I8eb030c9bdc29769b7a3c7e3ca383d29c0a0ebdb
 2011-11-28 20:11:53 -08:00
Mindy Pereira
30003e582f Show correct error when adding widget with no email accts on device. 
If the WidgetConfiguration service is disabled until the user adds an account,
adding the widget just fails badly as there is no service registered
to handed an APPWIDGET_CONFIGURE intent.
Fixes b/5613821 App isn't installed toast message when creating widget for Email without any account

Change-Id: I98003eadf71fb944d3c0902f7e132ca7c5b67571
 2011-11-28 16:30:12 -08:00
The Android Automerger
572166ddf0 merge in ics-mr1-release history after reset to ics-mr1 2011-11-28 12:22:53 -08:00
Mindy Pereira
ac96f64081 Merge "Check for account before launching welcome screen." 2011-11-28 11:35:07 -08:00
Mindy Pereira
fe402a8081 Check for account before launching welcome screen. 
If this is running via monkey, might not have an account yet.

fixes b/5518958 java.lang.NullPointerException at com.android.email.activity.MessageCompose.onBack(MessageCompose.java:1797)

Change-Id: I17fb606a2fd3aad685a855ae8bd9eda551296ca3
 2011-11-28 11:26:03 -08:00
Mindy Pereira
d767a7625f Fixup wait activity screen to look like Gmail. 
Fixes b/5642479 "Waiting for sync" in ugly font

Change-Id: I61ea9b296eb7f64c80f8992c77724fc02a978d38
 2011-11-28 11:04:54 -08:00
The Android Open Source Project
87dde96eaf Reconcile with ics-mr1-release 
Change-Id: I9f6ebf6661626efa2a398e362eb1f172e253f16c
 2011-11-22 13:26:11 -08:00
The Android Automerger
7d5655758e merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:56:41 -08:00
Eric Fischer
0408c1c598 am fb675952: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'fb675952572431929e543f9f4d72117a682e7ba8':
  Import revised translations. DO NOT MERGE
 2011-11-21 21:08:12 -08:00
Eric Fischer
fb67595257 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-21 15:26:35 -08:00
Eric Fischer
208346aaf5 Import revised translations. DO NOT MERGE 
Change-Id: I2b7089ceb301e014b44a702a20fb2ccf0fd31574
 2011-11-21 14:58:32 -08:00
Marc Blank
fd81e19779 Don't save Policy with Account 
Change-Id: Ib3601daee8780640a07db573f623e99279c9f9b1
 2011-11-21 13:04:26 -08:00
Mindy Pereira
5789a78af3 Merge "Add account should be shown on all Email prefs screens and subscreens on tablet." 2011-11-18 15:43:25 -08:00
Mindy Pereira
f579eb8ac3 Add account should be shown on all Email prefs screens and subscreens on tablet. 
For phone, should match Gmail and just show it at the top level.
Fixes b/5621803 "Add account" button disappeared - IKXEVERESTLTE-3051

Change-Id: I143043485cbb912023fe015a768c6f37c8cad3f5
 2011-11-18 15:25:36 -08:00
Vikram Aggarwal
8957df83d4 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 15:23:09 -08:00
Mindy Pereira
e8c06cffea am d22cf7bd: (-s ours) 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 15:23:08 -08:00
Mindy Pereira
7a7f544c0c 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 15:23:08 -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