Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5213275d authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

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

* commit 'bb3c36c8':
  Make enlarged actionbar invisible when showing dialpad
parents c167bc5a bb3c36c8
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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())
@@ -548,10 +550,12 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
                        public void onAnimationEnd(Animator animation) {
                            mBottomPaddingView.setVisibility(View.VISIBLE);
                            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);
                    }
                });