commit e9a81035bcef5a372fa13a992f8553eb60e6aaf0
author Vikram Aggarwal <viki@google.com> Wed Feb 22 13:15:35 2012 -0800
committer Vikram Aggarwal <viki@google.com> Wed Feb 22 14:26:14 2012 -0800
tree df68a07b173375864de5ea7e98cf414960e1022a
parent 57dbf94828d896e09acc0adf4929cc657159975f

Start showing label list on tablets

Change-Id: Ib5529ce2eca88c71979ed0bc6340cb2a752ffd25

src/com/android/mail/ui/AbstractActivityController.java

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 6613dbe..6714d15 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -149,15 +149,13 @@
     }
 
     @Override
-    public String getCurrentAccount() {
-        // TODO(viki): Auto-generated method stub
-        return null;
+    public Account getCurrentAccount() {
+        return mAccount;
     }
 
     @Override
     public ConversationListContext getCurrentListContext() {
-        // TODO(viki): Auto-generated method stub
-        return null;
+        return mConvListContext;
     }
 
     @Override
@@ -381,8 +379,6 @@
 
     @Override
     public void onResume() {
-        // TODO(viki): Auto-generated method stub
-        //        mBatchConversations.addObserver(this);
         if (mActionBarView != null) {
             mActionBarView.onResume();
         }
@@ -405,31 +401,26 @@
     @Override
     public void onSearchRequested() {
         // TODO(viki): Auto-generated method stub
-
     }
 
     @Override
     public void onStartBulkOperation() {
         // TODO(viki): Auto-generated method stub
-
     }
 
     @Override
     public void onStartDragMode() {
         // TODO(viki): Auto-generated method stub
-
     }
 
     @Override
     public void onStop() {
         // TODO(viki): Auto-generated method stub
-
     }
 
     @Override
     public void onStopDragMode() {
         // TODO(viki): Auto-generated method stub
-
     }
 
     /**
@@ -445,7 +436,7 @@
         // reset the action bar icon based on the mode. Why don't the individual controllers do
         // this themselves?
 
-        // On conversation list mode, clean up the conversation.
+        // In conversation list mode, clean up the conversation.
         if (newMode == ViewMode.CONVERSATION_LIST) {
             // Clean up the conversation here.
         }
@@ -460,13 +451,11 @@
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         // TODO(viki): Auto-generated method stub
-
     }
 
     @Override
     public void reloadSearch(String string) {
         // TODO(viki): Auto-generated method stub
-
     }
 
     /**
@@ -488,9 +477,6 @@
     protected void restoreState(Bundle savedState) {
         if (savedState != null) {
             restoreListContext(savedState);
-            // Restore the list context
-            restoreListContext(savedState);
-
             // Attach the menu handler here.
 
             // Restore the view mode
@@ -507,19 +493,16 @@
     @Override
     public void startActionBarStatusCursorLoader(String account) {
         // TODO(viki): Auto-generated method stub
-
     }
 
     @Override
     public void stopActionBarStatusCursorLoader(String account) {
         // TODO(viki): Auto-generated method stub
-
     }
 
     @Override
     public void toggleStar(boolean toggleOn, long conversationId, long maxMessageId) {
         // TODO(viki): Auto-generated method stub
-
     }
 
     @Override
@@ -588,7 +571,6 @@
         // onLoadFinished will be called and we will be fine.
     }
 
-
     @Override
     public void onTouchEvent(MotionEvent event) {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {