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

Commit 675bcfb0 authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

Merge "Fix analytics in Contacts app" into lmp-mr1-dev

parents 0da93008 a3e498a1

src/com/android/contacts/ContactsApplication.java

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import com.android.contacts.common.list.ContactListFilterController; 
import com.android.contacts.common.model.AccountTypeManager;

import com.android.contacts.common.testing.InjectedServices;

import com.android.contacts.common.util.Constants;

import com.android.contacts.commonbind.analytics.AnalyticsUtil;



import com.google.common.annotations.VisibleForTesting;



public final class ContactsApplication extends Application {
@@ -128,6 +130,8 @@ public final class ContactsApplication extends Application { 
        if (Log.isLoggable(Constants.PERFORMANCE_TAG, Log.DEBUG)) {

            Log.d(Constants.PERFORMANCE_TAG, "ContactsApplication.onCreate finish");

        }



        AnalyticsUtil.initialize(this);

    }



    private class DelayedInitializer extends AsyncTask<Void, Void, Void> {

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

+1 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import android.widget.ImageView; 
import android.widget.TextView;

import android.widget.Toast;



import com.android.contacts.ContactsActivity;

import com.android.contacts.R;

import com.android.contacts.editor.Editor;

import com.android.contacts.editor.EditorUiUtils;
@@ -103,7 +102,7 @@ import java.util.List; 
 * Note when there's no accounts, it *is* okay to show the picker / dialog, because the local-only

 * contacts are writable.

 */

public class ConfirmAddDetailActivity extends ContactsActivity implements

public class ConfirmAddDetailActivity extends Activity implements

        DialogManager.DialogShowingViewActivity {



    private static final String TAG = "ConfirmAdd"; // The class name is too long to be a tag.

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

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.widget.Button; 
import android.widget.ListView;

import android.widget.TextView;



import com.android.contacts.ContactsActivity;

import com.android.contacts.R;

import com.android.contacts.editor.ContactEditorUtils;

import com.android.contacts.common.model.AccountTypeManager;
@@ -46,7 +45,7 @@ import java.util.List; 
 * the new contact in. If the activity result doesn't contain intent data, then there is no

 * account for this contact.

 */

public class ContactEditorAccountsChangedActivity extends ContactsActivity {

public class ContactEditorAccountsChangedActivity extends Activity {



    private static final String TAG = ContactEditorAccountsChangedActivity.class.getSimpleName();

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

+2 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.animation.ObjectAnimator;

import android.animation.PropertyValuesHolder;

import android.app.Activity;

import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;
@@ -32,7 +33,6 @@ import android.view.ViewGroup.MarginLayoutParams; 
import android.widget.FrameLayout.LayoutParams;

import android.widget.ImageView;



import com.android.contacts.ContactsActivity;

import com.android.contacts.common.ContactPhotoManager;

import com.android.contacts.ContactSaveService;

import com.android.contacts.R;
@@ -44,7 +44,7 @@ import com.android.contacts.util.SchedulingUtils; 
/**

 * Popup activity for choosing a contact photo within the Contacts app.

 */

public class PhotoSelectionActivity extends ContactsActivity {

public class PhotoSelectionActivity extends Activity {



    private static final String TAG = "PhotoSelectionActivity";

src/com/android/contacts/editor/ContactEditorFragment.java

+1 −3
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ import com.android.contacts.util.ContactPhotoUtils; 
import com.android.contacts.util.HelpUtils;

import com.android.contacts.util.PhoneCapabilityTester;

import com.android.contacts.util.UiClosables;

import com.android.contacts.commonbind.analytics.AnalyticsFragment;



import com.google.common.collect.ImmutableList;

import com.google.common.collect.Lists;
@@ -104,7 +102,7 @@ import java.util.Collections; 
import java.util.Comparator;

import java.util.List;



public class ContactEditorFragment extends AnalyticsFragment implements

public class ContactEditorFragment extends Fragment implements

        SplitContactConfirmationDialogFragment.Listener,

        AggregationSuggestionEngine.Listener, AggregationSuggestionView.Listener,

        RawContactReadOnlyEditorView.Listener {