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

Commit cea82125 authored by Walter Jang's avatar Walter Jang
Browse files

Remove Yenta (1/2) 

This reverts commit f61f0ee8
This reverts commit f0f25f54

Test: see Ied562bbf4fface5d3c57eb9b24e834f65b6ec9b2
Bug: 34107138

Change-Id: I000ab52bc356e377fa0f480c22d60453a07755ed
parent fc022c20

src-bind/com/android/contactsbind/ObjectFactory.java

+0 −5
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.net.Uri; 


import com.android.contacts.logging.Logger;

import com.android.contacts.util.DeviceLocalAccountTypeFactory;

import com.android.contactsbind.search.AutocompleteHelper;



/**

 * Creates default bindings for overlays.
@@ -31,10 +30,6 @@ public class ObjectFactory { 
        return null;

    }



    public static AutocompleteHelper getAutocompleteHelper(Context context) {

        return null;

    }



    public static DeviceLocalAccountTypeFactory getDeviceLocalAccountTypeFactory(Context context) {

        return new DeviceLocalAccountTypeFactory.Default(context);

    }

src-bind/com/android/contactsbind/search/AutocompleteHelper.java

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.contactsbind.search;



import android.database.Cursor;



public final class AutocompleteHelper {



    public static final String TAG = "Autocomplete";



    public interface Listener {

        void onAutocompletesAvailable(Cursor cursor);

    }



    public AutocompleteHelper() {

    }



    public void setListener(Listener listener) {

    }



    public void setProjection(String[] projection) {

    }



    public void setQuery(String query) {

    }

}
 
 No newline at end of file

src/com/android/contacts/Experiments.java

+0 −10
Original line number Diff line number Diff line
@@ -48,16 +48,6 @@ public final class Experiments { 
    public static final String PULL_TO_REFRESH_CANCEL_REFRESH_MILLIS =

            "PullToRefresh__cancel_refresh_millis";



    /**

     * Search study boolean indicating whether to inject yenta search results before CP2 results.

     */

    public static final String SEARCH_YENTA = "Search__yenta";



    /**

     * The time to wait for Yenta search results before giving up.

     */

    public static final String SEARCH_YENTA_TIMEOUT_MILLIS = "Search__yenta_timeout";



    private Experiments() {

    }

}

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

+1 −8
Original line number Diff line number Diff line
@@ -1237,12 +1237,5 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
        return intent;

    }



    @Override

    protected void onActivityResult(int requestCode, int resultCode, Intent data) {

        if (requestCode == DefaultContactBrowseListFragment.ACTIVITY_REQUEST_QUICK_CONTACT &&

                resultCode == ContactDeletionInteraction.RESULT_CODE_DELETED &&

                mContactsListFragment != null) {

            mContactsListFragment.maybeRestartDefaultDirectoryPartitionLoader();

        }

    }



}

src/com/android/contacts/interactions/ContactDeletionInteraction.java

+0 −12
Original line number Diff line number Diff line
@@ -81,10 +81,6 @@ public class ContactDeletionInteraction extends Fragment 
    private static final int COLUMN_INDEX_DISPLAY_NAME = 5;

    private static final int COLUMN_INDEX_DISPLAY_NAME_ALT = 6;



    public interface Listener {

        void onDeletionFinished();

    }



    private boolean mActive;

    private Uri mContactUri;

    private String mDisplayName;
@@ -92,7 +88,6 @@ public class ContactDeletionInteraction extends Fragment 
    private boolean mFinishActivityWhenDone;

    private Context mContext;

    private AlertDialog mDialog;

    private Listener mListener;



    /** This is a wrapper around the fragment's loader manager to be used only during testing. */

    private TestLoaderManagerBase mTestLoaderManager;
@@ -351,9 +346,6 @@ public class ContactDeletionInteraction extends Fragment 


    protected void doDeleteContact(Uri contactUri) {

        mContext.startService(ContactSaveService.createDeleteContactIntent(mContext, contactUri));

        if (mListener != null) {

            mListener.onDeletionFinished();

        }

        if (isAdded() && mFinishActivityWhenDone) {

            getActivity().setResult(RESULT_CODE_DELETED);

            getActivity().finish();
@@ -370,8 +362,4 @@ public class ContactDeletionInteraction extends Fragment 
            Toast.makeText(mContext, deleteToastMessage, Toast.LENGTH_LONG).show();

        }

    }



    public void setListener(Listener listener) {

        mListener = listener;

    }

}