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

Commit 320b310f authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Make sure only People and Dialtacts responds to search key"

parents f7560321 8d5abcb7

AndroidManifest.xml

+0 −6
Original line number Diff line number Diff line
@@ -557,12 +557,6 @@ 
            android:theme="@android:style/Theme.Translucent">

        </activity>



        <!-- Makes .PeopleActivity the search target for any activity in Contacts -->

        <meta-data

            android:name="android.app.default_searchable"

            android:value=".activities.PeopleActivity" />





        <!-- LIVE FOLDERS -->

        <activity

            android:name=".ContactsLiveFolders$AllContacts"

src/com/android/contacts/CallDetailActivity.java

+0 −10
Original line number Diff line number Diff line
@@ -688,16 +688,6 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
        }

    }



    @Override

    public void startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData,

            boolean globalSearch) {

        if (globalSearch) {

            super.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch);

        } else {

            ContactsSearchManager.startSearch(this, initialQuery);

        }

    }



    protected void updateVoicemailStatusMessage(Cursor statusCursor) {

        if (statusCursor == null) {

            mStatusMessageView.setVisibility(View.GONE);

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

+0 −11
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.contacts.activities;



import com.android.contacts.ContactsSearchManager;

import com.android.contacts.R;

import com.android.contacts.calllog.CallLogFragment;

import com.android.internal.telephony.ITelephony;
@@ -99,14 +98,4 @@ public class CallLogActivity extends Activity { 
        }

        return super.onKeyUp(keyCode, event);

    }



    @Override

    public void startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData,

            boolean globalSearch) {

        if (globalSearch) {

            super.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch);

        } else {

            ContactsSearchManager.startSearch(this, initialQuery);

        }

    }

}

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

+0 −5
Original line number Diff line number Diff line
@@ -123,11 +123,6 @@ public class ContactDetailActivity extends ContactsActivity { 
        }

    }



    @Override

    public boolean onSearchRequested() {

        return true; // Don't respond to the search key.

    }



    @Override

    public boolean onCreateOptionsMenu(Menu menu) {

        super.onCreateOptionsMenu(menu);

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

+0 −5
Original line number Diff line number Diff line
@@ -130,11 +130,6 @@ public class ContactEditorActivity extends ContactsActivity 
        return null;

    }



    @Override

    public boolean onSearchRequested() {

        return true; // Don't respond to the search key.

    }



    @Override

    public void onBackPressed() {

        mFragment.save(SaveMode.CLOSE);