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

Commit 231a6fb2 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

Show the call option menu in Favorite tab too. 

Now that all three tabs show that, we don't need to manage it
on each Fragment.

Bug: 5149475
Change-Id: I16e1fa2bfeb4bffa6b9e37e2583da3614fa367da
parent 448d94bd

res/menu/call_log_options.xml

+0 −6
Original line number Diff line number Diff line
@@ -29,10 +29,4 @@ 
        android:id="@+id/show_all_calls"

        android:title="@string/menu_show_all_calls"

        android:showAsAction="withText" />



    <item

        android:id="@+id/menu_call_settings_call_log"

        android:title="@string/call_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:showAsAction="withText" />

</menu>

res/menu/dialpad_options.xml

+0 −6
Original line number Diff line number Diff line
@@ -30,10 +30,4 @@ 
        android:icon="@drawable/ic_menu_wait"

        android:title="@string/add_wait"

        android:showAsAction="withText" />



    <item

        android:id="@+id/menu_call_settings_dialpad"

        android:title="@string/call_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:showAsAction="withText" />

</menu>

res/menu/dialtacts_options.xml

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
        android:icon="@android:drawable/ic_menu_search"

        android:showAsAction="always" />



    <item

        android:id="@+id/menu_call_settings"

        android:title="@string/call_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:showAsAction="withText" />



    <item

        android:id="@+id/filter_option"

        android:title="@string/menu_contacts_filter"

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

+10 −5
Original line number Diff line number Diff line
@@ -644,20 +644,25 @@ public class DialtactsActivity extends Activity { 
    public boolean onPrepareOptionsMenu(Menu menu) {

        final MenuItem searchMenuItem = menu.findItem(R.id.search_on_action_bar);

        final MenuItem filterOptionMenuItem = menu.findItem(R.id.filter_option);

        final MenuItem callSettingsMenuItem = menu.findItem(R.id.menu_call_settings);

        Tab tab = getActionBar().getSelectedTab();

        if (mInSearchUi) {

            searchMenuItem.setVisible(false);

            filterOptionMenuItem.setVisible(true);

            filterOptionMenuItem.setOnMenuItemClickListener(

                    mFilterOptionsMenuItemClickListener);

        } else if (tab == null || tab.getPosition() == TAB_INDEX_DIALER) {

            callSettingsMenuItem.setVisible(false);

        } else {

            if (tab != null && tab.getPosition() == TAB_INDEX_DIALER) {

                searchMenuItem.setVisible(false);

            filterOptionMenuItem.setVisible(false);

            } else {

            filterOptionMenuItem.setVisible(false);

                searchMenuItem.setVisible(true);

                searchMenuItem.setOnMenuItemClickListener(mSearchMenuItemClickListener);

            }

            filterOptionMenuItem.setVisible(false);

            callSettingsMenuItem.setVisible(true);

            callSettingsMenuItem.setIntent(DialtactsActivity.getCallSettingsIntent());

        }



        return true;

    }

src/com/android/contacts/calllog/CallLogFragment.java

+0 −2
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ public class CallLogFragment extends ListFragment implements ViewPagerVisibility 
    @Override

    public void onPrepareOptionsMenu(Menu menu) {

        if (mShowOptionsMenu) {

            menu.findItem(R.id.menu_call_settings_call_log)

                .setIntent(DialtactsActivity.getCallSettingsIntent());

            menu.findItem(R.id.show_voicemails_only).setVisible(!mShowingVoicemailOnly);

            menu.findItem(R.id.show_all_calls).setVisible(mShowingVoicemailOnly);

        }