am 59e574d0: Merge "Remove obsolete TODOs and obsolete code" into jb-ub-mail-ur8
# Via Android (Google) Code Review (1) and Vikram Aggarwal (1)
* commit '59e574d0d3e823fdda91db34b269a1dd1b86dcc3':
Remove obsolete TODOs and obsolete code
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 69b56aa..76772b0 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -80,14 +80,8 @@
public static boolean isSyncInProgress(int syncStatus) {
return 0 != (syncStatus & (BACKGROUND_SYNC |
USER_REFRESH |
- LIVE_QUERY |
- USER_MORE_RESULTS));
+ LIVE_QUERY));
}
- /**
- * Unused currently, is not used by any provider.
- * TODO(viki): Remove.
- */
- public static final int USER_MORE_RESULTS = 1<<5;
}
/**
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 1adc85d..4b29d0b 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -886,7 +886,6 @@
@Override
public final boolean onKeyDown(int keyCode, KeyEvent event) {
- // TODO(viki): Auto-generated method stub
return false;
}
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index e097ad8..1a5e257 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -77,7 +77,6 @@
@Override
public void onRestoreInstanceState(Bundle inState) {
super.onRestoreInstanceState(inState);
- // TODO(mindyp) handle saved state.
if (inState == null) {
return;
}
@@ -95,7 +94,6 @@
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
- // TODO(mindyp) handle saved state.
outState.putInt(FOLDER_LIST_TRANSACTION_KEY, mLastFolderListTransactionId);
outState.putInt(INBOX_CONVERSATION_LIST_TRANSACTION_KEY,
mLastInboxConversationListTransactionId);
@@ -170,7 +168,6 @@
// When entering conversation list mode, hide and clean up any currently visible
// conversation.
- // TODO: improve this transition
if (ViewMode.isListMode(newMode)) {
mPagerController.hide(true /* changeVisibility */);
}
@@ -185,15 +182,11 @@
public void showConversationList(ConversationListContext listContext) {
super.showConversationList(listContext);
enableCabMode();
- // TODO(viki): Check if the account has been changed since the previous
- // time.
if (ConversationListContext.isSearchResult(listContext)) {
mViewMode.enterSearchResultsListMode();
} else {
mViewMode.enterConversationListMode();
}
- // TODO(viki): This account transition looks strange in two pane mode.
- // Revisit as the app is coming together and improve the look and feel.
final int transition = mConversationListNeverShown
? FragmentTransaction.TRANSIT_FRAGMENT_FADE
: FragmentTransaction.TRANSIT_FRAGMENT_OPEN;
@@ -248,7 +241,6 @@
// activity, as when the transaction is popped off, the FragmentManager will attempt to
// readd the same fragment twice
if (f != null && f.isAdded()) {
- // TODO: improve this transition
ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
ft.remove(f);
ft.commitAllowingStateLoss();
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 77f9f67..0aa9a43 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -37,8 +37,6 @@
* Controller for two-pane Mail activity. Two Pane is used for tablets, where screen real estate
* abounds.
*/
-
-// Called TwoPaneActivityController in Gmail.
public final class TwoPaneController extends AbstractActivityController {
private TwoPaneLayout mLayout;
private Conversation mConversationToShow;
@@ -121,9 +119,8 @@
}
fragmentTransaction.replace(R.id.content_pane, folderListFragment, TAG_FOLDER_LIST);
fragmentTransaction.commitAllowingStateLoss();
- // Since we are showing the folder list, we are at the start of the view
- // stack.
- // TODO(viki): We don't need this call. Evaluate and remove.
+ // We only set the action bar if the viewmode has been set previously. Otherwise, we leave
+ // the action bar in the state it is currently in.
if (mViewMode.getMode() != ViewMode.UNKNOWN) {
resetActionBarIcon();
}