From c311af1f33f9d408c7eee5a6eeda46f1d1b7265b Mon Sep 17 00:00:00 2001 From: Brian Attwell Date: Wed, 22 Oct 2014 18:28:58 -0700 Subject: Delete duplicated class Also renamed dialerbind package Analytics CL #2/5 Bug: 18039620 Change-Id: I45722015978038cdccb6a848c28e4b6c90d5aa4f --- src/com/android/dialer/CallDetailActivity.java | 2 +- src/com/android/dialer/DialtactsActivity.java | 3 +- .../dialer/activity/TransactionSafeActivity.java | 67 ---------------------- .../android/dialer/calllog/CallLogActivity.java | 2 +- .../android/dialer/calllog/CallLogFragment.java | 3 +- .../android/dialer/dialpad/DialpadFragment.java | 2 +- .../dialer/dialpad/SmartDialCursorLoader.java | 2 - .../interactions/PhoneNumberInteraction.java | 2 +- src/com/android/dialer/list/ListsFragment.java | 2 +- src/com/android/dialer/list/SpeedDialFragment.java | 2 +- .../dialer/settings/DialerSettingsActivity.java | 5 +- .../voicemail/VoicemailPlaybackFragment.java | 3 +- 12 files changed, 11 insertions(+), 84 deletions(-) delete mode 100644 src/com/android/dialer/activity/TransactionSafeActivity.java (limited to 'src') diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index f6b88cd72..2c8d4fca1 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -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; diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 7071e5137..aacf20844 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -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; diff --git a/src/com/android/dialer/activity/TransactionSafeActivity.java b/src/com/android/dialer/activity/TransactionSafeActivity.java deleted file mode 100644 index d7a212021..000000000 --- a/src/com/android/dialer/activity/TransactionSafeActivity.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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; - } -} diff --git a/src/com/android/dialer/calllog/CallLogActivity.java b/src/com/android/dialer/calllog/CallLogActivity.java index 036241c3f..1de3da209 100644 --- a/src/com/android/dialer/calllog/CallLogActivity.java +++ b/src/com/android/dialer/calllog/CallLogActivity.java @@ -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; diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java index e5c3c58a5..f4db08068 100644 --- a/src/com/android/dialer/calllog/CallLogFragment.java +++ b/src/com/android/dialer/calllog/CallLogFragment.java @@ -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; diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index c83a16c08..c9ea25a68 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -72,12 +72,12 @@ import com.android.contacts.common.GeoUtil; import com.android.contacts.common.util.PhoneNumberFormatter; import com.android.contacts.common.util.StopWatch; import com.android.contacts.common.widget.FloatingActionButtonController; +import com.android.contacts.commonbind.analytics.AnalyticsFragment; import com.android.dialer.DialtactsActivity; import com.android.dialer.NeededForReflection; import com.android.dialer.R; import com.android.dialer.SpecialCharSequenceMgr; import com.android.dialer.util.DialerUtils; -import com.android.dialerbind.analytics.AnalyticsFragment; import com.android.phone.common.CallLogAsync; import com.android.phone.common.HapticFeedback; import com.android.phone.common.animation.AnimUtils; diff --git a/src/com/android/dialer/dialpad/SmartDialCursorLoader.java b/src/com/android/dialer/dialpad/SmartDialCursorLoader.java index 369079618..d01776c61 100644 --- a/src/com/android/dialer/dialpad/SmartDialCursorLoader.java +++ b/src/com/android/dialer/dialpad/SmartDialCursorLoader.java @@ -20,8 +20,6 @@ import android.content.AsyncTaskLoader; import android.content.Context; import android.database.Cursor; import android.database.MatrixCursor; -import android.provider.ContactsContract.CommonDataKinds.Phone; -import android.telephony.PhoneNumberUtils; import android.util.Log; import com.android.contacts.common.list.PhoneNumberListAdapter.PhoneQuery; diff --git a/src/com/android/dialer/interactions/PhoneNumberInteraction.java b/src/com/android/dialer/interactions/PhoneNumberInteraction.java index b61a496c2..de217ce7b 100644 --- a/src/com/android/dialer/interactions/PhoneNumberInteraction.java +++ b/src/com/android/dialer/interactions/PhoneNumberInteraction.java @@ -49,9 +49,9 @@ import com.android.contacts.common.CallUtil; import com.android.contacts.common.Collapser; import com.android.contacts.common.Collapser.Collapsible; import com.android.contacts.common.MoreContactUtils; +import com.android.contacts.common.activity.TransactionSafeActivity; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.R; -import com.android.dialer.activity.TransactionSafeActivity; import com.android.dialer.contact.ContactUpdateService; import com.android.dialer.util.DialerUtils; diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java index 024e3d914..de501f47e 100644 --- a/src/com/android/dialer/list/ListsFragment.java +++ b/src/com/android/dialer/list/ListsFragment.java @@ -20,6 +20,7 @@ import android.widget.ListView; import com.android.contacts.common.GeoUtil; import com.android.contacts.common.list.ViewPagerTabs; +import com.android.contacts.commonbind.analytics.AnalyticsFragment; import com.android.dialer.DialtactsActivity; import com.android.dialer.R; import com.android.dialer.calllog.CallLogAdapter; @@ -31,7 +32,6 @@ import com.android.dialer.list.ShortcutCardsAdapter.SwipeableShortcutCard; import com.android.dialer.util.DialerUtils; import com.android.dialer.widget.OverlappingPaneLayout; import com.android.dialer.widget.OverlappingPaneLayout.PanelSlideCallbacks; -import com.android.dialerbind.analytics.AnalyticsFragment; import com.android.dialerbind.ObjectFactory; import java.util.ArrayList; diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java index c12acb09d..fd761b758 100644 --- a/src/com/android/dialer/list/SpeedDialFragment.java +++ b/src/com/android/dialer/list/SpeedDialFragment.java @@ -46,9 +46,9 @@ import com.android.contacts.common.ContactPhotoManager; import com.android.contacts.common.ContactTileLoaderFactory; import com.android.contacts.common.list.ContactTileView; import com.android.contacts.common.list.OnPhoneNumberPickerActionListener; +import com.android.contacts.commonbind.analytics.AnalyticsFragment; import com.android.dialer.R; import com.android.dialer.util.DialerUtils; -import com.android.dialerbind.analytics.AnalyticsFragment; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java index f7a92d748..7d80ac390 100644 --- a/src/com/android/dialer/settings/DialerSettingsActivity.java +++ b/src/com/android/dialer/settings/DialerSettingsActivity.java @@ -8,20 +8,19 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.preference.PreferenceManager; -import android.preference.PreferenceActivity.Header; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.TextView; +import com.android.contacts.commonbind.analytics.AnalyticsPreferenceActivity; + import com.android.dialer.DialtactsActivity; import com.android.dialer.R; -import com.android.dialerbind.analytics.AnalyticsPreferenceActivity; import java.util.List; diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java b/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java index 133a98807..2a76ed3e2 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java @@ -39,15 +39,14 @@ import android.widget.SeekBar; import android.widget.TextView; import com.android.common.io.MoreCloseables; +import com.android.contacts.commonbind.analytics.AnalyticsFragment; import com.android.dialer.ProximitySensorAware; import com.android.dialer.R; import com.android.dialer.util.AsyncTaskExecutors; -import com.android.dialerbind.analytics.AnalyticsFragment; import com.android.ex.variablespeed.MediaPlayerProxy; import com.android.ex.variablespeed.VariableSpeed; import com.google.common.base.Preconditions; -import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -- cgit v1.2.3