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

Commit e4c2f549 authored by Brian Attwell's avatar Brian Attwell
Browse files

Use analytics activities and fragments 

All Contacts's activities and fragments now inherit from
analytics base classes.

Bug: 18039620
Change-Id: Ia550263640f60bc3f7daa7e85cd9f612f0dfc8a8
parent 1f9f48d4

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

+2 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 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;
@@ -102,7 +103,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 Activity implements

public class ConfirmAddDetailActivity extends ContactsActivity 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

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 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;
@@ -45,7 +46,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 Activity {

public class ContactEditorAccountsChangedActivity extends ContactsActivity {



    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,7 +19,6 @@ 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;
@@ -33,6 +32,7 @@ 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 Activity {

public class PhotoSelectionActivity extends ContactsActivity {



    private static final String TAG = "PhotoSelectionActivity";

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

+3 −1
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ 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;
@@ -102,7 +104,7 @@ import java.util.Collections; 
import java.util.Comparator;

import java.util.List;



public class ContactEditorFragment extends Fragment implements

public class ContactEditorFragment extends AnalyticsFragment implements

        SplitContactConfirmationDialogFragment.Listener,

        AggregationSuggestionEngine.Listener, AggregationSuggestionView.Listener,

        RawContactReadOnlyEditorView.Listener {

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

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.DialogInterface; 
import android.os.Bundle;



import com.android.contacts.R;

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



/**

 * Shows a dialog asking the user whether to split the contact. The result is passed back
@@ -31,7 +32,7 @@ import com.android.contacts.R; 
 * has to implement {@link SplitContactConfirmationDialogFragment.Listener}.

 * Does not split the contact itself.

 */

public class SplitContactConfirmationDialogFragment extends DialogFragment {

public class SplitContactConfirmationDialogFragment extends AnalyticsDialogFragment {

    public static final String TAG = "SplitContactConfirmationDialog";



    public SplitContactConfirmationDialogFragment() {