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

Commit 8d5abcb7 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Make sure only People and Dialtacts responds to search key 

- Remove the default search activity meta-data from manifest, so the old-style
search dialog won't show up when the serach key is pressed.  It was for
pre-HC style search UI.  Now the search key only works on people and dialtacts,
which implement either startSearch or onSearchRequested.

- Removed all the startSearch/onSearchRequested methods which are now
unnecessary.

- Also removed startSearch() in some fragmets.  They're not used.

- Tested some viewer/editor/picker activities, and also both dialtacts and
people, the launcher search box, and the SEARCH intent, on both the phone
and the tablet (except dialtacts on tablet).  All looking good.

Bug 5230790

Change-Id: If269df74ae218707daa5b7039439c6fea2575e8d
parent cc23e754

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
@@ -687,16 +687,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
@@ -120,11 +120,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);