summaryrefslogtreecommitdiffstats
path: root/src/com/android/mail/compose
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/mail/compose')
-rw-r--r--src/com/android/mail/compose/AttachmentsView.java6
-rw-r--r--src/com/android/mail/compose/CcBccView.java4
-rw-r--r--src/com/android/mail/compose/ComposeActivity.java2
-rw-r--r--src/com/android/mail/compose/QuotedTextView.java2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/mail/compose/AttachmentsView.java b/src/com/android/mail/compose/AttachmentsView.java
index 9e2c4bae4..650622e10 100644
--- a/src/com/android/mail/compose/AttachmentsView.java
+++ b/src/com/android/mail/compose/AttachmentsView.java
@@ -331,8 +331,7 @@ class AttachmentsView extends LinearLayout {
return attachment.size;
}
- @VisibleForTesting
- private int getSizeFromFile(Uri uri, ContentResolver contentResolver) {
+ private static int getSizeFromFile(Uri uri, ContentResolver contentResolver) {
int size = -1;
ParcelFileDescriptor file = null;
try {
@@ -358,7 +357,8 @@ class AttachmentsView extends LinearLayout {
* @return a cursor to the requested column or null if an exception occurs while trying
* to query it.
*/
- private Cursor getOptionalColumn(ContentResolver contentResolver, Uri uri, String columnName) {
+ private static Cursor getOptionalColumn(ContentResolver contentResolver, Uri uri,
+ String columnName) {
Cursor result = null;
try {
result = contentResolver.query(uri, new String[]{columnName}, null, null, null);
diff --git a/src/com/android/mail/compose/CcBccView.java b/src/com/android/mail/compose/CcBccView.java
index cb778ccc7..962201786 100644
--- a/src/com/android/mail/compose/CcBccView.java
+++ b/src/com/android/mail/compose/CcBccView.java
@@ -51,7 +51,7 @@ public class CcBccView extends RelativeLayout {
mCc.setVisibility(showCc ? View.VISIBLE : View.GONE);
mBcc.setVisibility(showBcc ? View.VISIBLE : View.GONE);
if (animate) {
- animate(showCc, showBcc, ccWasAlreadyShown);
+ animate(ccWasAlreadyShown);
} else {
if (showCc) {
mCc.setAlpha(1);
@@ -63,7 +63,7 @@ public class CcBccView extends RelativeLayout {
}
}
- private void animate(Boolean showCc, boolean showBcc, boolean ccWasAlreadyShown) {
+ private void animate(boolean ccWasAlreadyShown) {
Resources res = getResources();
// Then, have cc/ bcc fade in
int fadeDuration = res.getInteger(R.integer.fadein_cc_bcc_dur);
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 7c15977e8..1f444fac7 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -1327,7 +1327,7 @@ public class ComposeActivity extends Activity implements OnClickListener, OnNavi
* @param toReplace Input string
* @return The string with all "+" characters replaced with "%2B"
*/
- private String replacePlus(String toReplace) {
+ private static String replacePlus(String toReplace) {
return toReplace.replace("+", "%2B");
}
diff --git a/src/com/android/mail/compose/QuotedTextView.java b/src/com/android/mail/compose/QuotedTextView.java
index c8ddc3e9e..95079d196 100644
--- a/src/com/android/mail/compose/QuotedTextView.java
+++ b/src/com/android/mail/compose/QuotedTextView.java
@@ -237,7 +237,7 @@ class QuotedTextView extends LinearLayout implements OnClickListener {
public void onRespondInline(String text);
}
- private String getHtmlText(Message message) {
+ private static String getHtmlText(Message message) {
if (message.bodyHtml != null) {
return message.bodyHtml;
} else if (message.bodyText != null) {