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

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

am 7146ee81: Fix slight screen jank when sliding dialpad upwards

* commit '7146ee81':
  Fix slight screen jank when sliding dialpad upwards
parents d8f7967d 7146ee81
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@
            <FrameLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:id="@+id/search_and_remove_view_container"
                >
                <LinearLayout
                    android:layout_width="match_parent"
+31 −32
Original line number Diff line number Diff line
@@ -168,6 +168,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
    private boolean mFirstLaunch;
    private View mSearchViewContainer;
    private RemoveView mRemoveViewContainer;
    // This view points to the Framelayout that houses both the search view and remove view
    // containers.
    private View mSearchAndRemoveViewContainer;
    private View mSearchViewCloseButton;
    private View mVoiceSearchButton;
    private EditText mSearchView;
@@ -310,6 +313,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
        mFragmentsFrame = findViewById(R.id.dialtacts_frame);

        mRemoveViewContainer = (RemoveView) findViewById(R.id.remove_view_container);
        mSearchAndRemoveViewContainer = (View) findViewById(R.id.search_and_remove_view_container);
        prepareSearchView();

        if (UI.FILTER_CONTACTS_ACTION.equals(intent.getAction())
@@ -564,7 +568,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
    final AnimatorListener mHideListener = new AnimatorListenerAdapter() {
        @Override
        public void onAnimationEnd(Animator animation) {
            mSearchViewContainer.setVisibility(View.GONE);
            mSearchAndRemoveViewContainer.setVisibility(View.GONE);
        }
    };

@@ -583,43 +587,38 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
    }

    public void hideSearchBar() {
       hideSearchBar(true);
    }

    public void hideSearchBar(boolean shiftView) {
        if (shiftView) {
            mSearchViewContainer.animate().cancel();
            mSearchViewContainer.setAlpha(1);
            mSearchViewContainer.setTranslationY(0);
            mSearchViewContainer.animate().withLayer().alpha(0).translationY(-mSearchView.getHeight())
                    .setDuration(200).setListener(mHideListener);
        final int height = mSearchAndRemoveViewContainer.getHeight();
        mSearchAndRemoveViewContainer.animate().cancel();
        mSearchAndRemoveViewContainer.setAlpha(1);
        mSearchAndRemoveViewContainer.setTranslationY(0);
        mSearchAndRemoveViewContainer.animate().withLayer().alpha(0)
                .translationY(-height).setDuration(200)
                .setListener(mHideListener);

        mFragmentsFrame.animate().withLayer()
                    .translationY(-mSearchViewContainer.getHeight()).setDuration(200).setListener(
                .translationY(-height).setDuration(200).setListener(
                new AnimatorListenerAdapter() {
                    @Override
                    public void onAnimationEnd(Animator animation) {
                        mFragmentsFrame.setTranslationY(0);
                    }
                });
        } else {
            mSearchViewContainer.setTranslationY(-mSearchView.getHeight());
        }
    }

    public void showSearchBar() {
        mSearchViewContainer.animate().cancel();
        mSearchViewContainer.setAlpha(0);
        mSearchViewContainer.setTranslationY(-mSearchViewContainer.getHeight());
        mSearchViewContainer.animate().withLayer().alpha(1).translationY(0).setDuration(200)
                .setListener(new AnimatorListenerAdapter() {
        final int height = mSearchAndRemoveViewContainer.getHeight();
        mSearchAndRemoveViewContainer.animate().cancel();
        mSearchAndRemoveViewContainer.setAlpha(0);
        mSearchAndRemoveViewContainer.setTranslationY(-height);
        mSearchAndRemoveViewContainer.animate().withLayer().alpha(1).translationY(0)
                .setDuration(200).setListener(new AnimatorListenerAdapter() {
                        @Override
                        public void onAnimationStart(Animator animation) {
                        mSearchViewContainer.setVisibility(View.VISIBLE);
                            mSearchAndRemoveViewContainer.setVisibility(View.VISIBLE);
                        }
                    });

        mFragmentsFrame.setTranslationY(-mSearchViewContainer.getHeight());
        mFragmentsFrame.setTranslationY(-height);
        mFragmentsFrame.animate().withLayer().translationY(0).setDuration(200)
                .setListener(
                        new AnimatorListenerAdapter() {