Merge "Prune dependencies" into jb-ub-mail
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 1fa57af..b7ecc7b 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -76,9 +76,7 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Set;
-import java.util.Timer;
import java.util.TimerTask;
@@ -119,9 +117,6 @@
/** Tag used when loading a folder list fragment. */
protected static final String TAG_FOLDER_LIST = "tag-folder-list";
- /** Are we on a tablet device or not. */
- public final boolean IS_TABLET_DEVICE;
-
protected Account mAccount;
protected Folder mFolder;
protected ActionBarView mActionBarView;
@@ -217,7 +212,6 @@
mFragmentManager = mActivity.getFragmentManager();
mViewMode = viewMode;
mContext = activity.getApplicationContext();
- IS_TABLET_DEVICE = Utils.useTabletUI(mContext);
mRecentFolderList = new RecentFolderList(mContext);
// Allow the fragment to observe changes to its own selection set. No other object is
// aware of the selected set.
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index edcbacb..e7d8927 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -22,7 +22,6 @@
import android.app.FragmentTransaction;
import android.net.Uri;
import android.os.Bundle;
-import android.view.MenuItem;
import com.android.mail.ConversationListContext;
import com.android.mail.R;
@@ -31,11 +30,8 @@
import com.android.mail.providers.Folder;
import com.android.mail.providers.Settings;
import com.android.mail.providers.UIProvider;
-import com.android.mail.providers.UIProvider.ConversationColumns;
import com.android.mail.utils.LogUtils;
-import java.util.Collection;
-
/**
* Controller for one-pane Mail activity. One Pane is used for phones, where screen real estate is
* limited. This controller also does the layout, since the layout is simpler in the one pane case.
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 9022d46..f2672a3 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -24,7 +24,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.view.Gravity;
-import android.view.MenuItem;
import android.widget.FrameLayout;
import com.android.mail.ConversationListContext;
@@ -32,14 +31,9 @@
import com.android.mail.providers.Account;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
-import com.android.mail.providers.Settings;
-import com.android.mail.providers.UIProvider;
-import com.android.mail.providers.UIProvider.ConversationColumns;
import com.android.mail.utils.LogUtils;
import com.android.mail.utils.Utils;
-import java.util.Collection;
-
/**
* Controller for two-pane Mail activity. Two Pane is used for tablets, where screen real estate
* abounds.