am 9d264b6f: am 5213275d: am bb3c36c8: Merge "Make enlarged actionbar invisible when showing dialpad" into klp-dev

* commit '9d264b6f5beca5ef553119c1734430746d44caa7':
  Make enlarged actionbar invisible when showing dialpad

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 42cbbf4c1..82d5c3fee 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -144,6 +144,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
     // Padding view used to shift the fragments up when the dialpad is shown.
     private View mBottomPaddingView;
     private View mFragmentsFrame;
+    private View mActionBar;
 
     private boolean mInDialpadSearch;
     private boolean mInRegularSearch;
@@ -302,6 +303,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
 
         mBottomPaddingView = findViewById(R.id.dialtacts_bottom_padding);
         mFragmentsFrame = findViewById(R.id.dialtacts_frame);
+        mActionBar = findViewById(R.id.fake_action_bar);
         prepareSearchView();
 
         if (UI.FILTER_CONTACTS_ACTION.equals(intent.getAction())
@@ -547,11 +549,13 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
                         @Override
                         public void onAnimationEnd(Animator animation) {
                             mBottomPaddingView.setVisibility(View.VISIBLE);
-                                mFragmentsFrame.setTranslationY(0);
+                            mFragmentsFrame.setTranslationY(0);
+                            mActionBar.setVisibility(View.INVISIBLE);
                         }
                     });
         } else {
             mSearchViewContainer.setTranslationY(-mSearchView.getHeight());
+            mActionBar.setVisibility(View.INVISIBLE);
         }
     }
 
@@ -564,6 +568,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
                     @Override
                     public void onAnimationStart(Animator animation) {
                         mSearchViewContainer.setVisibility(View.VISIBLE);
+                        mActionBar.setVisibility(View.VISIBLE);
                     }
                 });