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

Commit bd114976 authored by Wenyi Wang's avatar Wenyi Wang
Browse files

Speed up app bar and FAB animation (1/2) 

* Speed up app bar fade in/out to 195ms

Bug 30288176

Change-Id: Ib642a827c9a8a173b74f0b423ed9b88605f408f1
parent 02bcdfe1

res/values/integers.xml

+3 −0
Original line number Diff line number Diff line
@@ -25,4 +25,7 @@ 
    <!-- The maximum allowed group name length -->

    <integer name="group_name_max_length">40</integer>



    <!-- Fade in/out duration of search and selection -->

    <integer name="action_bar_animation_duration">195</integer>



</resources>

src/com/android/contacts/activities/ActionBarAdapter.java

+9 −4
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ public class ActionBarAdapter implements OnCloseListener { 


    private int mMaxPortraitTabHeight;

    private int mMaxToolbarContentInsetStart;

    private int mActionBarAnimationDuration;



    private final Activity mActivity;

    private final SharedPreferences mPrefs;
@@ -144,6 +145,8 @@ public class ActionBarAdapter implements OnCloseListener { 
        mToolBarFrame = (FrameLayout) mToolbar.getParent();

        mMaxToolbarContentInsetStart = mToolbar.getContentInsetStart();

        mSearchHintResId = searchHintResId;

        mActionBarAnimationDuration =

                mActivity.getResources().getInteger(R.integer.action_bar_animation_duration);



        setupSearchAndSelectionViews();

        setupTabs(mActivity);
@@ -465,7 +468,7 @@ public class ActionBarAdapter implements OnCloseListener { 
            if (mSelectionMode) {

                addSelectionContainer();

                mSelectionContainer.setAlpha(0);

                mSelectionContainer.animate().alpha(1);

                mSelectionContainer.animate().alpha(1).setDuration(mActionBarAnimationDuration);

                animateTabHeightChange(mMaxPortraitTabHeight, 0);

                updateDisplayOptions(isSearchModeChanging);

            } else {
@@ -474,7 +477,8 @@ public class ActionBarAdapter implements OnCloseListener { 
                }

                mSelectionContainer.setAlpha(1);

                animateTabHeightChange(0, mMaxPortraitTabHeight);

                mSelectionContainer.animate().alpha(0).withEndAction(new Runnable() {

                mSelectionContainer.animate().alpha(0).setDuration(mActionBarAnimationDuration)

                        .withEndAction(new Runnable() {

                    @Override

                    public void run() {

                        updateDisplayOptions(isSearchModeChanging);
@@ -491,13 +495,14 @@ public class ActionBarAdapter implements OnCloseListener { 
            if (mSearchMode) {

                addSearchContainer();

                mSearchContainer.setAlpha(0);

                mSearchContainer.animate().alpha(1);

                mSearchContainer.animate().alpha(1).setDuration(mActionBarAnimationDuration);

                animateTabHeightChange(mMaxPortraitTabHeight, 0);

                updateDisplayOptions(isSearchModeChanging);

            } else {

                mSearchContainer.setAlpha(1);

                animateTabHeightChange(0, mMaxPortraitTabHeight);

                mSearchContainer.animate().alpha(0).withEndAction(new Runnable() {

                mSearchContainer.animate().alpha(0).setDuration(mActionBarAnimationDuration)

                        .withEndAction(new Runnable() {

                    @Override

                    public void run() {

                        updateDisplayOptions(isSearchModeChanging);