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

Commit 7d6b8087 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't always show FAB after stopping search or selection"

parents 8532f961 128f7d80

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

+3 −3
Original line number Diff line number Diff line
@@ -541,13 +541,13 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
                startSearchOrSelectionMode();

                break;

            case ActionBarAdapter.Listener.Action.BEGIN_STOPPING_SEARCH_AND_SELECTION_MODE:

                showFabWithAnimation(/* showFabWithAnimation = */ true);

                showFabWithAnimation(shouldShowFabForAccount());

                break;

            case ActionBarAdapter.Listener.Action.STOP_SEARCH_AND_SELECTION_MODE:

                setQueryTextToFragment("");

                updateFragmentsVisibility();

                invalidateOptionsMenu();

                showFabWithAnimation(/* showFabWithAnimation = */ true);

                showFabWithAnimation(shouldShowFabForAccount());

                break;

            case ActionBarAdapter.Listener.Action.CHANGE_SEARCH_QUERY:

                final String queryString = mActionBarAdapter.getQueryString();
@@ -564,7 +564,7 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
        configureFragments(false /* from request */);

        updateFragmentsVisibility();

        invalidateOptionsMenu();

        showFabWithAnimation(/* showFabWithAnimation = */ false);

        showFabWithAnimation(/* showFab */ false);

    }



    @Override