Merge "When dragging, don't slide action bar if pane is closed." into lmp-preview-dev

2 files changed, 10 insertions, 2 deletions

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 6a0706f8d..df2a87c8a 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -1007,7 +1007,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
      */
     @Override
     public void onDragStarted(int x, int y, PhoneFavoriteSquareTileView view) {
-        mActionBarController.slideActionBarUp(true);
+        if (mListsFragment.isPaneOpen()) {
+            mActionBarController.slideActionBarUp(true);
+        }
         mRemoveViewContainer.setVisibility(View.VISIBLE);
     }
 
@@ -1020,7 +1022,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
      */
     @Override
     public void onDragFinished(int x, int y) {
-        mActionBarController.slideActionBarDown(true);
+        if (mListsFragment.isPaneOpen()) {
+            mActionBarController.slideActionBarDown(true);
+        }
         mRemoveViewContainer.setVisibility(View.GONE);
     }
 
diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 30e0e0fa0..3de714d11 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -338,6 +338,10 @@ public class ListsFragment extends Fragment implements CallLogQueryHandler.Liste
         return mIsPanelOpen && mActionBar != null;
     }
 
+    public boolean isPaneOpen() {
+        return mIsPanelOpen;
+    }
+
     private void setupPaneLayout(OverlappingPaneLayout paneLayout) {
         // TODO: Remove the notion of a capturable view. The entire view be slideable, once
         // the framework better supports nested scrolling.