commit a6ba1b79a451ecabd131ce3c5cfef94ca3ea4860
author Yorke Lee <yorkelee@google.com> Fri May 30 23:00:31 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 30 23:00:32 2014 +0000
tree 5815f5a573fc4d63552e465abdbe2ed68b5c8010
parent 60d2e37b1d4e8b5e957b133fc261dcdabd418932
parent e9e0ba63e04202c8454d25d3af3d02f580a1a35d

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

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 6a0706f..df2a87c 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -1007,7 +1007,9 @@
      */
     @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 @@
      */
     @Override
     public void onDragFinished(int x, int y) {
-        mActionBarController.slideActionBarDown(true);
+        if (mListsFragment.isPaneOpen()) {
+            mActionBarController.slideActionBarDown(true);
+        }
         mRemoveViewContainer.setVisibility(View.GONE);
     }
 

src/com/android/dialer/list/ListsFragment.java

diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 30e0e0f..3de714d 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -338,6 +338,10 @@
         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.