From a610bd6e2aecf06bf6d14f869bad68e0110d3fe3 Mon Sep 17 00:00:00 2001 From: Sai Cheemalapati Date: Tue, 29 Jul 2014 15:55:46 -0700 Subject: Changing Dialer Fragments to implement Analytics. Dialer's Fragments now implement AnalyticsFragment. All Fragments now have access to sendHitEvent, which is a no op in AOSP Dialer. Change-Id: Ife6ab7d5369a1c96caaedbe1c59e6d07a0adae87 --- .../android/dialer/calllog/CallLogFragment.java | 4 ++-- .../android/dialer/dialpad/DialpadFragment.java | 4 ++-- src/com/android/dialer/list/ListsFragment.java | 3 ++- src/com/android/dialer/list/SpeedDialFragment.java | 4 ++-- .../voicemail/VoicemailPlaybackFragment.java | 4 ++-- .../dialerbind/analytics/AnalyticsActivity.java | 24 ---------------------- .../dialerbind/analytics/AnalyticsFragment.java | 24 ---------------------- .../dialerbind/analytics/AnalyticsInterface.java | 21 ------------------- .../analytics/AnalyticsListFragment.java | 24 ---------------------- .../analytics/AnalyticsPreferenceActivity.java | 24 ---------------------- 10 files changed, 10 insertions(+), 126 deletions(-) delete mode 100644 src/com/android/dialerbind/analytics/AnalyticsActivity.java delete mode 100644 src/com/android/dialerbind/analytics/AnalyticsFragment.java delete mode 100644 src/com/android/dialerbind/analytics/AnalyticsInterface.java delete mode 100644 src/com/android/dialerbind/analytics/AnalyticsListFragment.java delete mode 100644 src/com/android/dialerbind/analytics/AnalyticsPreferenceActivity.java (limited to 'src') diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java index 52375ed6c..ded65ed64 100644 --- a/src/com/android/dialer/calllog/CallLogFragment.java +++ b/src/com/android/dialer/calllog/CallLogFragment.java @@ -22,7 +22,6 @@ import android.animation.Animator.AnimatorListener; import android.app.Activity; import android.app.DialogFragment; import android.app.KeyguardManager; -import android.app.ListFragment; import android.content.Context; import android.content.Intent; import android.database.ContentObserver; @@ -58,6 +57,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 java.util.List; @@ -65,7 +65,7 @@ import java.util.List; * Displays a list of call log entries. To filter for a particular kind of call * (all, missed or voicemails), specify it in the constructor. */ -public class CallLogFragment extends ListFragment +public class CallLogFragment extends AnalyticsListFragment implements CallLogQueryHandler.Listener, CallLogAdapter.OnReportButtonClickListener, CallLogAdapter.CallFetcher, CallLogAdapter.CallItemExpandedListener { diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 0491d973a..9968c096d 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -20,7 +20,6 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; -import android.app.Fragment; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -74,6 +73,7 @@ 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; @@ -87,7 +87,7 @@ import java.util.HashSet; /** * Fragment that displays a twelve-key phone dialpad. */ -public class DialpadFragment extends Fragment +public class DialpadFragment extends AnalyticsFragment implements View.OnClickListener, View.OnLongClickListener, View.OnKeyListener, AdapterView.OnItemClickListener, TextWatcher, diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java index 4f96d63f4..8ca66cf3f 100644 --- a/src/com/android/dialer/list/ListsFragment.java +++ b/src/com/android/dialer/list/ListsFragment.java @@ -35,6 +35,7 @@ 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.PanelSlideListener; +import com.android.dialerbind.analytics.AnalyticsFragment; import com.android.dialerbind.ObjectFactory; import java.util.ArrayList; @@ -47,7 +48,7 @@ import java.util.ArrayList; * ViewPager containing the lists up above the shortcut cards and pin it against the top of the * screen. */ -public class ListsFragment extends Fragment implements CallLogQueryHandler.Listener, +public class ListsFragment extends AnalyticsFragment implements CallLogQueryHandler.Listener, CallLogAdapter.CallFetcher, ViewPager.OnPageChangeListener { private static final boolean DEBUG = DialtactsActivity.DEBUG; diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java index a04d4ccef..9732e19b3 100644 --- a/src/com/android/dialer/list/SpeedDialFragment.java +++ b/src/com/android/dialer/list/SpeedDialFragment.java @@ -19,7 +19,6 @@ import android.animation.Animator; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.app.Activity; -import android.app.Fragment; import android.app.LoaderManager; import android.content.CursorLoader; import android.content.Loader; @@ -49,6 +48,7 @@ import com.android.contacts.common.list.ContactTileView; import com.android.contacts.common.list.OnPhoneNumberPickerActionListener; 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; @@ -56,7 +56,7 @@ import java.util.HashMap; /** * This fragment displays the user's favorite/frequent contacts in a grid. */ -public class SpeedDialFragment extends Fragment implements OnItemClickListener, +public class SpeedDialFragment extends AnalyticsFragment implements OnItemClickListener, PhoneFavoritesTileAdapter.OnDataSetChangedForAnimationListener { /** diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java b/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java index 33ae5c8b4..133a98807 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackFragment.java @@ -20,7 +20,6 @@ import static com.android.dialer.CallDetailActivity.EXTRA_VOICEMAIL_START_PLAYBA import static com.android.dialer.CallDetailActivity.EXTRA_VOICEMAIL_URI; import android.app.Activity; -import android.app.Fragment; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -43,6 +42,7 @@ import com.android.common.io.MoreCloseables; 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; @@ -66,7 +66,7 @@ import javax.annotation.concurrent.NotThreadSafe; * methods on this class are expected to come from the main ui thread. */ @NotThreadSafe -public class VoicemailPlaybackFragment extends Fragment { +public class VoicemailPlaybackFragment extends AnalyticsFragment { private static final String TAG = "VoicemailPlayback"; private static final int NUMBER_OF_THREADS_IN_POOL = 2; private static final String[] HAS_CONTENT_PROJECTION = new String[] { diff --git a/src/com/android/dialerbind/analytics/AnalyticsActivity.java b/src/com/android/dialerbind/analytics/AnalyticsActivity.java deleted file mode 100644 index 9abe1ab3e..000000000 --- a/src/com/android/dialerbind/analytics/AnalyticsActivity.java +++ /dev/null @@ -1,24 +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.dialerbind.analytics; - -import android.app.Activity; - -public class AnalyticsActivity extends Activity implements AnalyticsInterface { - public void sendHitEvent(String categoryId, String actionId, String labelId) { - } -} diff --git a/src/com/android/dialerbind/analytics/AnalyticsFragment.java b/src/com/android/dialerbind/analytics/AnalyticsFragment.java deleted file mode 100644 index 8ebe7ce18..000000000 --- a/src/com/android/dialerbind/analytics/AnalyticsFragment.java +++ /dev/null @@ -1,24 +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.dialerbind.analytics; - -import android.app.Fragment; - -public class AnalyticsFragment extends Fragment implements AnalyticsInterface { - public void sendHitEvent(String categoryId, String actionId, String labelId) { - } -} diff --git a/src/com/android/dialerbind/analytics/AnalyticsInterface.java b/src/com/android/dialerbind/analytics/AnalyticsInterface.java deleted file mode 100644 index ddc1b3fed..000000000 --- a/src/com/android/dialerbind/analytics/AnalyticsInterface.java +++ /dev/null @@ -1,21 +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.dialerbind.analytics; - -public interface AnalyticsInterface { - public void sendHitEvent(String categoryId, String actionId, String labelId); -} diff --git a/src/com/android/dialerbind/analytics/AnalyticsListFragment.java b/src/com/android/dialerbind/analytics/AnalyticsListFragment.java deleted file mode 100644 index bc668aa7a..000000000 --- a/src/com/android/dialerbind/analytics/AnalyticsListFragment.java +++ /dev/null @@ -1,24 +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.dialerbind.analytics; - -import android.app.ListFragment; - -public class AnalyticsListFragment extends ListFragment implements AnalyticsInterface { - public void sendHitEvent(String categoryId, String actionId, String labelId) { - } -} diff --git a/src/com/android/dialerbind/analytics/AnalyticsPreferenceActivity.java b/src/com/android/dialerbind/analytics/AnalyticsPreferenceActivity.java deleted file mode 100644 index c411387f5..000000000 --- a/src/com/android/dialerbind/analytics/AnalyticsPreferenceActivity.java +++ /dev/null @@ -1,24 +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.dialerbind.analytics; - -import android.preference.PreferenceActivity; - -public class AnalyticsPreferenceActivity extends PreferenceActivity implements AnalyticsInterface { - public void sendHitEvent(String categoryId, String actionId, String labelId) { - } -} -- cgit v1.2.3