diff options
author | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-19 11:18:09 +0800 |
---|---|---|
committer | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-19 11:21:09 +0800 |
commit | f2597ce36785fda486fa7a911ec05147adcbbffe (patch) | |
tree | b3dd5c6632cae4c956f0f0910cb6b29d586a4ebe /src/com/android/messaging/ui | |
parent | f78767a5c487f0af799cb2f72a29d21286eb1932 (diff) | |
download | packages_apps_Messaging-f2597ce36785fda486fa7a911ec05147adcbbffe.tar.gz packages_apps_Messaging-f2597ce36785fda486fa7a911ec05147adcbbffe.tar.bz2 packages_apps_Messaging-f2597ce36785fda486fa7a911ec05147adcbbffe.zip |
Revert "Adding metrics related to Ridesharing"
Get rid of dependencies on the ambient SDK.
This reverts commit 7619c3c57f0e9cd41a26aa8170ecae05591ac466.
Change-Id: If9f191cd610e30ef991b994c36b0192620b7c212
Diffstat (limited to 'src/com/android/messaging/ui')
-rw-r--r-- | src/com/android/messaging/ui/conversation/ConversationActivity.java | 43 | ||||
-rw-r--r-- | src/com/android/messaging/ui/conversation/ConversationMessageView.java | 8 |
2 files changed, 0 insertions, 51 deletions
diff --git a/src/com/android/messaging/ui/conversation/ConversationActivity.java b/src/com/android/messaging/ui/conversation/ConversationActivity.java index 20f857d..66310ea 100644 --- a/src/com/android/messaging/ui/conversation/ConversationActivity.java +++ b/src/com/android/messaging/ui/conversation/ConversationActivity.java @@ -16,20 +16,14 @@ package com.android.messaging.ui.conversation; -import android.app.AlarmManager; -import android.app.job.JobInfo; -import android.app.job.JobScheduler; import android.app.FragmentManager; import android.app.FragmentTransaction; -import android.content.ComponentName; -import android.content.Context; import android.content.Intent; import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; import android.support.v7.app.ActionBar; import android.text.TextUtils; -import android.util.Log; import android.view.MenuItem; import com.android.messaging.R; @@ -48,13 +42,9 @@ import com.android.messaging.util.LogUtil; import com.android.messaging.util.OsUtil; import com.android.messaging.util.UiUtils; -import com.cyanogenmod.messaging.util.MetricsJob; - public class ConversationActivity extends BugleActionBarActivity implements ContactPickerFragmentHost, ConversationFragmentHost, ConversationActivityUiStateHost { - public static final String TAG = "ConversationActivity"; - public static final int FINISH_RESULT_CODE = 1; private static final String SAVED_INSTANCE_STATE_UI_STATE_KEY = "uistate"; @@ -127,39 +117,6 @@ public class ConversationActivity extends BugleActionBarActivity UIIntents.get().launchFullScreenVideoViewer(this, Uri.parse(extraToDisplay)); } } - - // Schedule a Job for Metrics Service - JobScheduler jobScheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE); - - if (jobScheduler != null) { - boolean jobExists = false; - for (JobInfo ji : jobScheduler.getAllPendingJobs()) { - if (ji.getId() != MetricsJob.METRICS_JOB_ID) { - // Job exists - jobExists = true; - break; - } - } - if (!jobExists) { - // We need a job to send our aggregated events to our metrics service every 24 hours. - // As long as this service has been used, we know we'll need this data. - ComponentName jobComponent = new ComponentName(this, MetricsJob.class); - - JobInfo job = new JobInfo.Builder(MetricsJob.METRICS_JOB_ID, jobComponent) - .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY) - .setPersisted(true) - .setPeriodic(AlarmManager.INTERVAL_DAY) - .setBackoffCriteria(AlarmManager.INTERVAL_FIFTEEN_MINUTES, - JobInfo.BACKOFF_POLICY_EXPONENTIAL) - .build(); - jobScheduler.schedule(job); - } else { - Log.v(TAG, "Messaging Metrics job " + MetricsJob.METRICS_JOB_ID + " already exists"); - } - } else { - Log.e(TAG, "Running on a device without JobScheduler." + - " Messaging Metrics will fail to collect."); - } } @Override diff --git a/src/com/android/messaging/ui/conversation/ConversationMessageView.java b/src/com/android/messaging/ui/conversation/ConversationMessageView.java index 54c18d5..fae36c3 100644 --- a/src/com/android/messaging/ui/conversation/ConversationMessageView.java +++ b/src/com/android/messaging/ui/conversation/ConversationMessageView.java @@ -17,7 +17,6 @@ package com.android.messaging.ui.conversation; import android.content.Context; -import android.content.ComponentName; import android.content.Intent; import android.content.res.Resources; import android.database.Cursor; @@ -84,7 +83,6 @@ import com.cyanogen.lookup.phonenumber.response.LookupResponse; import com.cyanogenmod.messaging.lookup.LookupProviderManager.LookupProviderListener; import com.cyanogenmod.messaging.ui.AttributionContactIconView; import com.cyanogenmod.messaging.util.GoogleStaticMapsUtil; -import com.cyanogenmod.messaging.util.MetricsHelper; import com.cyanogenmod.messaging.util.RidesharingUtil; import com.cyanogenmod.messaging.util.RoundedCornerTransformation; import com.google.common.base.Predicate; @@ -751,9 +749,6 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick builder.addDropoffLocation(decodedAddress); Intent intent = builder.build(); mContext.startActivity(intent); - - MetricsHelper.increaseCountOfEventMetricAfterValidate(mContext.getApplicationContext(), new ComponentName(mContext.getApplicationContext(), ConversationActivity.class), - MetricsHelper.MetricEvent.UBER_RIDE_REQUESTED); } } }); @@ -767,9 +762,6 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick mButtonDivider.measure(dividerWidthMeasureSpec, unspecifiedMeasureSpec); mMessageMapsView.setVisibility(View.VISIBLE); - - MetricsHelper.increaseCountOfEventMetricAfterValidate(mContext.getApplicationContext(), new ComponentName(mContext.getApplicationContext(), ConversationActivity.class), - MetricsHelper.MetricEvent.RIDESHARING_MAP_SHOWN); } private class ImageLoadedCallback implements com.squareup.picasso.Callback { |