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

Commit 946070f6 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Remove STOPSHIP regarding hiding options menu 

This was a workaroudn for a framework issue, which has been fixed.
Now this is enough to hide all options menu when there's no contacts.

Bug 5030449

Change-Id: Ib5235a3c37132a73f545e8399cc7fd22f7e6448c
parent 2b7d3c45

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

+4 −16
Original line number Diff line number Diff line
@@ -1195,11 +1195,10 @@ public class PeopleActivity extends ContactsActivity 


    @Override

    public boolean onCreateOptionsMenu(Menu menu) {

//      STOPSHIP Un-comment it once b/5027071 is fixed.

//        if (!areContactsAvailable()) {

        if (!areContactsAvailable()) {

            // If contacts aren't available, hide all menu items.

//            return false;

//        }

            return false;

        }

        super.onCreateOptionsMenu(menu);



        MenuInflater inflater = getMenuInflater();
@@ -1255,12 +1254,8 @@ public class PeopleActivity extends ContactsActivity 
    public boolean onPrepareOptionsMenu(Menu menu) {

        mOptionsMenuContactsAvailable = areContactsAvailable();

        if (!mOptionsMenuContactsAvailable) {

            // STOPSHIP Remove makeAllMenuItemsVisible()when STOPSHIP in onCreateOptionsMenu() is

            // fixed.

            makeAllMenuItemsVisible(menu, false);

            return false;

        }

        makeAllMenuItemsVisible(menu, true);



        final MenuItem searchMenu = menu.findItem(R.id.menu_search);

        final MenuItem addContactMenu = menu.findItem(R.id.menu_add_contact);
@@ -1314,13 +1309,6 @@ public class PeopleActivity extends ContactsActivity 
        return true;

    }



    private void makeAllMenuItemsVisible(Menu menu, boolean visible) {

        final int itemCount = menu.size();

        for (int i = 0; i < itemCount; i++) {

            menu.getItem(i).setVisible(visible);

        }

    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        switch (item.getItemId()) {