Loading res/layout/dialtacts_activity.xml +1 −0 Original line number Diff line number Diff line Loading @@ -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" Loading src/com/android/dialer/DialtactsActivity.java +31 −32 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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()) Loading Loading @@ -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); } }; Loading @@ -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() { Loading Loading
res/layout/dialtacts_activity.xml +1 −0 Original line number Diff line number Diff line Loading @@ -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" Loading
src/com/android/dialer/DialtactsActivity.java +31 −32 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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()) Loading Loading @@ -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); } }; Loading @@ -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() { Loading