Merge "Automatically open roots pane if default dir is empty." into nyc-dev

diff --cc packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index b3dac0a,67a5b25..475387b
--- 1/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
--- 2/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@@ -216,11 -216,13 +216,13 @@@ public abstract class BaseActivity exte
          return state;
      }
  
-     void onStackRestored(boolean restored, boolean external) {}
+     public void setRootsDrawerOpen(boolean open) {
+         mNavigator.revealRootsDrawer(open);
+     }
  
      void onRootPicked(RootInfo root) {
 -        // Skip refreshing if root didn't change
 -        if(root.equals(getCurrentRoot())) {
 +        // Skip refreshing if root nor directory didn't change
 +        if (root.equals(getCurrentRoot()) && mState.stack.size() == 1) {
              return;
          }
  

diff --cc packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index b6c27b5,ce9fd1b..997a51b
--- 1/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
--- 2/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@@ -98,10 -100,12 +99,13 @@@ import com.android.documentsui.model.Do
  import com.android.documentsui.model.DocumentStack;
  import com.android.documentsui.model.RootInfo;
  import com.android.documentsui.services.FileOperationService;
 +import com.android.documentsui.services.FileOperationService.OpType;
  import com.android.documentsui.services.FileOperations;
+ 
  import com.google.common.collect.Lists;
  
+ import java.lang.annotation.Retention;
+ import java.lang.annotation.RetentionPolicy;
  import java.util.ArrayList;
  import java.util.Collections;
  import java.util.List;