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

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

Delete duplicated class 

Also renamed dialerbind package

Analytics CL #2/5

Bug: 18039620
Change-Id: I45722015978038cdccb6a848c28e4b6c90d5aa4f
parent 11d2c3b2

src/com/android/dialer/CallDetailActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ import com.android.dialer.voicemail.VoicemailPlaybackFragment; 
import com.android.dialer.voicemail.VoicemailStatusHelper;

import com.android.dialer.voicemail.VoicemailStatusHelper.StatusMessage;

import com.android.dialer.voicemail.VoicemailStatusHelperImpl;

import com.android.dialerbind.analytics.AnalyticsActivity;

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



import java.util.List;

src/com/android/dialer/DialtactsActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -59,12 +59,12 @@ import android.widget.PopupMenu; 
import android.widget.Toast;



import com.android.contacts.common.CallUtil;

import com.android.contacts.common.activity.TransactionSafeActivity;

import com.android.contacts.common.dialog.ClearFrequentsDialog;

import com.android.contacts.common.interactions.ImportExportDialogFragment;

import com.android.contacts.common.interactions.TouchPointManager;

import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;

import com.android.contacts.common.widget.FloatingActionButtonController;

import com.android.dialer.activity.TransactionSafeActivity;

import com.android.dialer.calllog.CallLogActivity;

import com.android.dialer.database.DialerDatabaseHelper;

import com.android.dialer.dialpad.DialpadFragment;
@@ -86,7 +86,6 @@ import com.android.dialer.widget.ActionBarController; 
import com.android.dialer.widget.SearchEditTextLayout;

import com.android.dialer.widget.SearchEditTextLayout.OnBackButtonClickedListener;

import com.android.dialerbind.DatabaseHelperManager;

import com.android.incallui.CallCardFragment;

import com.android.phone.common.animation.AnimUtils;

import com.android.phone.common.animation.AnimationListenerAdapter;

src/com/android/dialer/activity/TransactionSafeActivity.java

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

 * Copyright (C) 2014 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.dialer.activity;



import android.app.Activity;

import android.os.Bundle;



import com.android.dialerbind.analytics.AnalyticsActivity;



/**

 * A common superclass that keeps track of whether an {@link Activity} has saved its state yet or

 * not.

 */

public abstract class TransactionSafeActivity extends AnalyticsActivity {



    private boolean mIsSafeToCommitTransactions;



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        mIsSafeToCommitTransactions = true;

    }



    @Override

    protected void onStart() {

        super.onStart();

        mIsSafeToCommitTransactions = true;

    }



    @Override

    protected void onResume() {

        super.onResume();

        mIsSafeToCommitTransactions = true;

    }



    @Override

    protected void onSaveInstanceState(Bundle outState) {

        super.onSaveInstanceState(outState);

        mIsSafeToCommitTransactions = false;

    }



    /**

     * Returns true if it is safe to commit {@link FragmentTransaction}s at this time, based on

     * whether {@link Activity#onSaveInstanceState} has been called or not.

     *

     * Make sure that the current activity calls into

     * {@link super.onSaveInstanceState(Bundle outState)} (if that method is overridden),

     * so the flag is properly set.

     */

    public boolean isSafeToCommitTransactions() {

        return mIsSafeToCommitTransactions;

    }

}

src/com/android/dialer/calllog/CallLogActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import com.android.dialer.DialtactsActivity; 
import com.android.dialer.R;

import com.android.dialer.voicemail.VoicemailStatusHelper;

import com.android.dialer.voicemail.VoicemailStatusHelperImpl;

import com.android.dialerbind.analytics.AnalyticsActivity;

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



public class CallLogActivity extends AnalyticsActivity implements CallLogQueryHandler.Listener {

    private Handler mHandler;

src/com/android/dialer/calllog/CallLogFragment.java

+1 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.provider.CallLog; 
import android.provider.CallLog.Calls;

import android.provider.ContactsContract;

import android.provider.VoicemailContract.Status;

import android.util.MutableInt;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -53,7 +52,7 @@ import com.android.dialer.voicemail.VoicemailStatusHelper; 
import com.android.dialer.voicemail.VoicemailStatusHelper.StatusMessage;

import com.android.dialer.voicemail.VoicemailStatusHelperImpl;

import com.android.dialerbind.ObjectFactory;

import com.android.dialerbind.analytics.AnalyticsListFragment;

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



import java.util.List;