diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-04-15 13:01:40 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-04-15 13:02:04 -0700 |
commit | 46ab2276f97518e9ba71e4bf3109b8ebd924cbab (patch) | |
tree | a6a52c769587b65fef3950530b2fbdd32df21de8 /src/com/android/launcher3/logging | |
parent | 534058492ff7d9a8a75b0fe709bddb6c3f6dcd79 (diff) | |
download | android_packages_apps_Trebuchet-46ab2276f97518e9ba71e4bf3109b8ebd924cbab.tar.gz android_packages_apps_Trebuchet-46ab2276f97518e9ba71e4bf3109b8ebd924cbab.tar.bz2 android_packages_apps_Trebuchet-46ab2276f97518e9ba71e4bf3109b8ebd924cbab.zip |
Removing Launcher broadcast support from Launcher3
Change-Id: Ibaf5fe1465d3858b060fc2958194cf60f22a11db
Diffstat (limited to 'src/com/android/launcher3/logging')
-rw-r--r-- | src/com/android/launcher3/logging/UserEventLogger.java | 66 |
1 files changed, 6 insertions, 60 deletions
diff --git a/src/com/android/launcher3/logging/UserEventLogger.java b/src/com/android/launcher3/logging/UserEventLogger.java index bc3afeb8a..606d34364 100644 --- a/src/com/android/launcher3/logging/UserEventLogger.java +++ b/src/com/android/launcher3/logging/UserEventLogger.java @@ -16,25 +16,17 @@ package com.android.launcher3.logging; -import android.content.BroadcastReceiver; -import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; -import android.util.Log; import android.view.View; import android.view.ViewParent; import com.android.launcher3.ItemInfo; -import com.android.launcher3.Launcher; -import com.android.launcher3.R; import com.android.launcher3.userevent.nano.LauncherLogProto; +import com.android.launcher3.userevent.nano.LauncherLogProto.Action; import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent; import com.android.launcher3.userevent.nano.LauncherLogProto.Target; -import com.android.launcher3.userevent.nano.LauncherLogProto.Action; import com.android.launcher3.util.ComponentKey; -import com.google.protobuf.nano.MessageNano; - import java.util.List; public abstract class UserEventLogger { @@ -79,14 +71,6 @@ public abstract class UserEventLogger { } private String TAG = "UserEventLogger"; - private static final boolean DEBUG_BROADCASTS = true; - - public static final String ACTION_LAUNCH = "com.android.launcher3.action.LAUNCH"; - public static final String EXTRA_INTENT = "intent";; - public static final String EXTRA_SOURCE = "source"; - - private final Launcher mLauncher; - private final String mLaunchBroadcastPermission; private long mElapsedContainerMillis; private long mElapsedSessionMillis; @@ -95,27 +79,6 @@ public abstract class UserEventLogger { // Used for filling in predictedRank on {@link Target}s. private List<ComponentKey> mPredictedApps; - public UserEventLogger(Launcher launcher) { - mLauncher = launcher; - mLaunchBroadcastPermission = - launcher.getResources().getString(R.string.receive_launch_broadcasts_permission); - - if (DEBUG_BROADCASTS) { - launcher.registerReceiver( - new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - Log.v(TAG, "got broadcast: " + intent + " for launched intent: " - + intent.getStringExtra(EXTRA_INTENT)); - } - }, - new IntentFilter(ACTION_LAUNCH), - mLaunchBroadcastPermission, - null - ); - } - } - // APP_ICON SHORTCUT WIDGET // -------------------------------------------------------------- // packageNameHash required optional required @@ -123,26 +86,7 @@ public abstract class UserEventLogger { // intentHash required // -------------------------------------------------------------- - /** - * Prepare {@link LauncherEvent} and {@link Intent} and then attach the event - * to the intent and then broadcast. - */ - public final void broadcastEvent(LauncherEvent ev, Intent intent) { - intent = new Intent(intent); - intent.setSourceBounds(null); - - final String flat = intent.toUri(0); - Intent broadcastIntent = new Intent(ACTION_LAUNCH).putExtra(EXTRA_INTENT, flat); - - broadcastIntent.putExtra(EXTRA_SOURCE, MessageNano.toByteArray(ev)); - String[] packages = ((Context)mLauncher).getResources().getStringArray(R.array.launch_broadcast_targets); - for(String p: packages) { - broadcastIntent.setPackage(p); - mLauncher.sendBroadcast(broadcastIntent, mLaunchBroadcastPermission); - } - } - - public final void logLaunch(View v, Intent intent) { + protected LauncherEvent createLogEvent(View v) { LauncherEvent event = LoggerUtils.initLauncherEvent( Action.TOUCH, Target.ITEM, Target.CONTAINER); event.action.touch = Action.TAP; @@ -158,9 +102,11 @@ public abstract class UserEventLogger { // Fill in the duration of time spent navigating in Launcher and the container. event.elapsedContainerMillis = System.currentTimeMillis() - mElapsedContainerMillis; event.elapsedSessionMillis = System.currentTimeMillis() - mElapsedSessionMillis; - processEvent(event); + return event; + } - broadcastEvent(event, intent); + public void logLaunch(View v, Intent intent) { + processEvent(createLogEvent(v)); } public void logTap(View v) { |