Merge "Remove some warnings" into jb-ub-mail-ur10

src/com/android/email/EmailAddressValidator.java

@@ -21,10 +21,12 @@ import com.android.emailcommon.mail.Address;
 import android.widget.AutoCompleteTextView.Validator;
 
 public class EmailAddressValidator implements Validator {
+    @Override
     public CharSequence fixText(CharSequence invalidText) {
         return "";
     }
 
+    @Override
     public boolean isValid(CharSequence text) {
         return Address.parse(text.toString()).length > 0;
     }

src/com/android/email/RequireManualSyncDialog.java

@@ -33,6 +33,7 @@ public class RequireManualSyncDialog extends AlertDialog implements OnClickListe
     }
 
     /** {@inheritDoc} */
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         // No-op.
     }

src/com/android/email/activity/setup/AccountSetupIncoming.java

@@ -189,6 +189,7 @@ public class AccountSetupIncoming extends AccountSetupActivity
      *
      * Launches the account checker.  Positive results are reported to onCheckSettingsOk().
      */
+    @Override
     public void onProceedNext(int checkMode, AccountServerBaseFragment target) {
         AccountCheckSettingsFragment checkerFragment =
             AccountCheckSettingsFragment.newInstance(checkMode, target);
@@ -201,6 +202,7 @@ public class AccountSetupIncoming extends AccountSetupActivity
     /**
      * Implements AccountServerBaseFragment.Callback
      */
+    @Override
     public void onEnableProceedButtons(boolean enable) {
         mNextButtonEnabled = enable;
         mNextButton.setEnabled(enable);
@@ -211,6 +213,7 @@ public class AccountSetupIncoming extends AccountSetupActivity
      *
      * If the checked settings are OK, proceed to outgoing settings screen
      */
+    @Override
     public void onCheckSettingsComplete(int result, int setupMode) {
         if (result == AccountCheckSettingsFragment.CHECK_SETTINGS_OK) {
             if (mServiceInfo.usesSmtp) {

src/com/android/email/activity/setup/AccountSetupOutgoing.java

@@ -85,6 +85,7 @@ public class AccountSetupOutgoing extends Activity
      *
      * Launches the account checker.  Positive results are reported to onCheckSettingsOk().
      */
+    @Override
     public void onProceedNext(int checkMode, AccountServerBaseFragment target) {
         AccountCheckSettingsFragment checkerFragment =
             AccountCheckSettingsFragment.newInstance(checkMode, target);
@@ -97,6 +98,7 @@ public class AccountSetupOutgoing extends Activity
     /**
      * Implements AccountServerBaseFragment.Callback
      */
+    @Override
     public void onEnableProceedButtons(boolean enable) {
         mNextButtonEnabled = enable;
         mNextButton.setEnabled(enable);
@@ -107,6 +109,7 @@ public class AccountSetupOutgoing extends Activity
      *
      * If the checked settings are OK, proceed to options screen
      */
+    @Override
     public void onCheckSettingsComplete(int result, int setupMode) {
         if (result == AccountCheckSettingsFragment.CHECK_SETTINGS_OK) {
             AccountSetupOptions.actionOptions(this);

src/com/android/email/activity/setup/DuplicateAccountDialogFragment.java

@@ -58,6 +58,7 @@ public class DuplicateAccountDialogFragment extends DialogFragment {
             .setPositiveButton(
                     R.string.okay_action,
                     new DialogInterface.OnClickListener() {
+                        @Override
                         public void onClick(DialogInterface dialog, int which) {
                             dismiss();
                         }

src/com/android/email/provider/EmailProvider.java

@@ -2464,7 +2464,7 @@ public class EmailProvider extends ContentProvider {
         return sb.toString();
     }
 
-    private int getCapabilities(Context context, long accountId) {
+    private static int getCapabilities(Context context, long accountId) {
         final EmailServiceProxy service =
                 EmailServiceUtils.getServiceForAccount(context, accountId);
         int capabilities = 0;
@@ -2803,7 +2803,7 @@ public class EmailProvider extends ContentProvider {
         mc.addRow(values);
     }
 
-    private int getConversationListIcon(MailPrefs mailPrefs) {
+    private static int getConversationListIcon(MailPrefs mailPrefs) {
         return mailPrefs.getShowSenderImages() ?
                 UIProvider.ConversationListIcon.SENDER_IMAGE :
                 UIProvider.ConversationListIcon.NONE;
@@ -4602,6 +4602,7 @@ public class EmailProvider extends ContentProvider {
          }
     }
 
+    @Override
     public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
         Context context = getContext();
         writer.println("Installed services:");

src/com/android/email/provider/FolderPickerSelectorAdapter.java

@@ -37,6 +37,7 @@ public class FolderPickerSelectorAdapter extends HierarchicalFolderSelectorAdapt
      * Return whether the supplied folder meets the requirements to be displayed
      * in the folder list.
      */
+    @Override
     protected boolean meetsRequirements(Folder folder) {
         // We only want to show the non-Trash folders that can accept moved messages
         return folder.supportsCapability(FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES)

src/com/android/email/service/EmailBroadcastProcessorService.java

@@ -161,7 +161,7 @@ public class EmailBroadcastProcessorService extends IntentService {
      * @param amAccount The account for which to disable syncs.
      * @param authority The authority for which to disable syncs.
      */
-    private void removePeriodicSyncs(final android.accounts.Account amAccount,
+    private static void removePeriodicSyncs(final android.accounts.Account amAccount,
             final String authority) {
         final List<PeriodicSync> syncs =
                 ContentResolver.getPeriodicSyncs(amAccount, authority);

src/com/android/email/service/PolicyService.java

@@ -34,6 +34,7 @@ public class PolicyService extends Service {
     private Context mContext;
 
     private final IPolicyService.Stub mBinder = new IPolicyService.Stub() {
+        @Override
         public boolean isActive(Policy policy) {
             try {
                 return mSecurityPolicy.isActive(policy);
@@ -45,10 +46,12 @@ public class PolicyService extends Service {
             }
         }
 
+        @Override
         public void setAccountHoldFlag(long accountId, boolean newState) {
             SecurityPolicy.setAccountHoldFlag(mContext, accountId, newState);
         }
 
+        @Override
         public void remoteWipe() {
             try {
                 mSecurityPolicy.remoteWipe();
@@ -60,6 +63,7 @@ public class PolicyService extends Service {
             }
         }
 
+        @Override
         public void setAccountPolicy(long accountId, Policy policy, String securityKey) {
             try {
                 mSecurityPolicy.setAccountPolicy(accountId, policy, securityKey);

src/com/android/email/view/CertificateSelector.java

@@ -146,10 +146,12 @@ public class CertificateSelector extends RelativeLayout implements OnClickListen
         @SuppressWarnings("hiding")
         public static final Parcelable.Creator<SavedState> CREATOR
                 = new Parcelable.Creator<SavedState>() {
+            @Override
             public SavedState createFromParcel(Parcel in) {
                 return new SavedState(in);
             }
 
+            @Override
             public SavedState[] newArray(int size) {
                 return new SavedState[size];
             }