commit 69514b6decbe53f92e223f49325b502a6ec05fb7
author Jean-Baptiste Queru <jbq@google.com> Mon Nov 22 12:47:27 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 22 12:47:27 2010 -0800
tree c5b0d2a38151be42bc5562c2bea0dd8ac80d0d29
parent ce29eafabafa902e2095f9511a162b269b2001c6
parent 12505ca2f8db8b9856e3d36dc572b75810c878d3

am 12505ca2: Merge "unused private members removed from AccountSyncSettings unused local variable removed from AddAccountSettings override warnings fixed for SyncActivityTooManyDeletes"

* commit '12505ca2f8db8b9856e3d36dc572b75810c878d3':
  unused private members removed from AccountSyncSettings unused local variable removed from AddAccountSettings override warnings fixed for SyncActivityTooManyDeletes

src/com/android/settings/AccountSyncSettings.java

diff --git a/src/com/android/settings/AccountSyncSettings.java b/src/com/android/settings/AccountSyncSettings.java
index 3200a13..d6c9920 100644
--- a/src/com/android/settings/AccountSyncSettings.java
+++ b/src/com/android/settings/AccountSyncSettings.java
@@ -59,7 +59,6 @@
 public class AccountSyncSettings extends AccountPreferenceBase implements OnClickListener {
     private static final String ACCOUNT_KEY = "account";
     private static final String TAG = "AccountSettings";
-    private static final String CHANGE_PASSWORD_KEY = "changePassword";
     private static final int MENU_SYNC_NOW_ID = Menu.FIRST;
     private static final int MENU_SYNC_CANCEL_ID = Menu.FIRST + 1;
     private static final int REALLY_REMOVE_DIALOG = 100;
@@ -73,7 +72,6 @@
     protected View mRemoveAccountArea;
     private java.text.DateFormat mDateFormat;
     private java.text.DateFormat mTimeFormat;
-    private Preference mAuthenticatorPreferences;
     private Account mAccount;
     // List of all accounts, updated when accounts are added/removed
     // We need to re-scan the accounts on sync events, in case sync state changes.

src/com/android/settings/AddAccountSettings.java

diff --git a/src/com/android/settings/AddAccountSettings.java b/src/com/android/settings/AddAccountSettings.java
index 3481172..50c95a9 100644
--- a/src/com/android/settings/AddAccountSettings.java
+++ b/src/com/android/settings/AddAccountSettings.java
@@ -107,11 +107,9 @@
 
     private AccountManagerCallback<Bundle> mCallback = new AccountManagerCallback<Bundle>() {
         public void run(AccountManagerFuture<Bundle> future) {
-            boolean accountAdded = false;
             try {
                 Bundle bundle = future.getResult();
                 bundle.keySet();
-                accountAdded = true;
                 if (LDEBUG) Log.d(TAG, "account added: " + bundle);
             } catch (OperationCanceledException e) {
                 if (LDEBUG) Log.d(TAG, "addAccount was canceled");

src/com/android/settings/SyncActivityTooManyDeletes.java

diff --git a/src/com/android/settings/SyncActivityTooManyDeletes.java b/src/com/android/settings/SyncActivityTooManyDeletes.java
index d122640..1ffaa0a 100644
--- a/src/com/android/settings/SyncActivityTooManyDeletes.java
+++ b/src/com/android/settings/SyncActivityTooManyDeletes.java
@@ -107,8 +107,8 @@
         setContentView(ll);
     }
 
-    public void onItemClick(AdapterView parent, View view, int position, long id) {
-        // the contants for position correspond to the items options array in onCreate()
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        // the constants for position correspond to the items options array in onCreate()
         if (position == 0) startSyncReallyDelete();
         else if (position == 1) startSyncUndoDeletes();
         finish();