resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
This commit is contained in:
1 parent
a83129f0bc
commit
e612775922
630 files changed
+23760
-21646
No files matched your search
@@ -20,16 +20,64 @@ import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.ArrayList;
|
||||
import android.view.View;
|
||||
import android.view.ViewParent;
|
||||
|
||||
public class Stats {
|
||||
private static final boolean DEBUG_BROADCASTS = false;
|
||||
private static final String TAG = "Launcher3/Stats";
|
||||
|
||||
private static final boolean LOCAL_LAUNCH_LOG = true;
|
||||
/**
|
||||
* Implemented by containers to provide a launch source for a given child.
|
||||
*/
|
||||
public interface LaunchSourceProvider {
|
||||
void fillInLaunchSourceData(Bundle sourceData);
|
||||
}
|
||||
|
||||
/**
|
||||
* Helpers to add the source to a launch intent.
|
||||
*/
|
||||
public static class LaunchSourceUtils {
|
||||
/**
|
||||
* Create a default bundle for LaunchSourceProviders to fill in their data.
|
||||
*/
|
||||
public static Bundle createSourceData() {
|
||||
Bundle sourceData = new Bundle();
|
||||
sourceData.putString(SOURCE_EXTRA_CONTAINER, CONTAINER_HOMESCREEN);
|
||||
// Have default container/sub container pages
|
||||
sourceData.putInt(SOURCE_EXTRA_CONTAINER_PAGE, 0);
|
||||
sourceData.putInt(SOURCE_EXTRA_SUB_CONTAINER_PAGE, 0);
|
||||
return sourceData;
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds the next launch source provider in the parents of the view hierarchy and populates
|
||||
* the source data from that provider.
|
||||
*/
|
||||
public static void populateSourceDataFromAncestorProvider(View v, Bundle sourceData) {
|
||||
if (v == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Stats.LaunchSourceProvider provider = null;
|
||||
ViewParent parent = v.getParent();
|
||||
while (parent != null && parent instanceof View) {
|
||||
if (parent instanceof Stats.LaunchSourceProvider) {
|
||||
provider = (Stats.LaunchSourceProvider) parent;
|
||||
break;
|
||||
}
|
||||
parent = parent.getParent();
|
||||
}
|
||||
|
||||
if (provider != null) {
|
||||
provider.fillInLaunchSourceData(sourceData);
|
||||
} else if (LauncherAppState.isDogfoodBuild()) {
|
||||
throw new RuntimeException("Expected LaunchSourceProvider");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static final boolean DEBUG_BROADCASTS = false;
|
||||
|
||||
public static final String ACTION_LAUNCH = "com.android.launcher3.action.LAUNCH";
|
||||
public static final String EXTRA_INTENT = "intent";
|
||||
@@ -37,55 +85,37 @@ public class Stats {
|
||||
public static final String EXTRA_SCREEN = "screen";
|
||||
public static final String EXTRA_CELLX = "cellX";
|
||||
public static final String EXTRA_CELLY = "cellY";
|
||||
public static final String EXTRA_SOURCE = "source";
|
||||
|
||||
private static final int LOG_VERSION = 1;
|
||||
private static final int LOG_TAG_VERSION = 0x1;
|
||||
private static final int LOG_TAG_LAUNCH = 0x1000;
|
||||
public static final String SOURCE_EXTRA_CONTAINER = "container";
|
||||
public static final String SOURCE_EXTRA_CONTAINER_PAGE = "container_page";
|
||||
public static final String SOURCE_EXTRA_SUB_CONTAINER = "sub_container";
|
||||
public static final String SOURCE_EXTRA_SUB_CONTAINER_PAGE = "sub_container_page";
|
||||
|
||||
private static final int STATS_VERSION = 1;
|
||||
private static final int INITIAL_STATS_SIZE = 100;
|
||||
public static final String CONTAINER_SEARCH_BOX = "search_box";
|
||||
public static final String CONTAINER_ALL_APPS = "all_apps";
|
||||
public static final String CONTAINER_HOMESCREEN = "homescreen"; // aka. Workspace
|
||||
public static final String CONTAINER_HOTSEAT = "hotseat";
|
||||
|
||||
// TODO: delayed/batched writes
|
||||
private static final boolean FLUSH_IMMEDIATELY = true;
|
||||
public static final String SUB_CONTAINER_FOLDER = "folder";
|
||||
public static final String SUB_CONTAINER_ALL_APPS_A_Z = "a-z";
|
||||
public static final String SUB_CONTAINER_ALL_APPS_PREDICTION = "prediction";
|
||||
public static final String SUB_CONTAINER_ALL_APPS_SEARCH = "search";
|
||||
|
||||
private final Launcher mLauncher;
|
||||
|
||||
private final String mLaunchBroadcastPermission;
|
||||
|
||||
DataOutputStream mLog;
|
||||
|
||||
ArrayList<String> mIntents;
|
||||
ArrayList<Integer> mHistogram;
|
||||
|
||||
public Stats(Launcher launcher) {
|
||||
mLauncher = launcher;
|
||||
|
||||
mLaunchBroadcastPermission =
|
||||
launcher.getResources().getString(R.string.receive_launch_broadcasts_permission);
|
||||
|
||||
loadStats();
|
||||
|
||||
if (LOCAL_LAUNCH_LOG) {
|
||||
try {
|
||||
mLog = new DataOutputStream(mLauncher.openFileOutput(
|
||||
LauncherFiles.LAUNCHES_LOG, Context.MODE_APPEND));
|
||||
mLog.writeInt(LOG_TAG_VERSION);
|
||||
mLog.writeInt(LOG_VERSION);
|
||||
} catch (FileNotFoundException e) {
|
||||
Log.e(TAG, "unable to create stats log: " + e);
|
||||
mLog = null;
|
||||
} catch (IOException e) {
|
||||
Log.e(TAG, "unable to write to stats log: " + e);
|
||||
mLog = null;
|
||||
}
|
||||
}
|
||||
|
||||
if (DEBUG_BROADCASTS) {
|
||||
launcher.registerReceiver(
|
||||
new BroadcastReceiver() {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
android.util.Log.v("Stats", "got broadcast: " + intent + " for launched intent: "
|
||||
Log.v("Stats", "got broadcast: " + intent + " for launched intent: "
|
||||
+ intent.getStringExtra(EXTRA_INTENT));
|
||||
}
|
||||
},
|
||||
@@ -96,26 +126,11 @@ public class Stats {
|
||||
}
|
||||
}
|
||||
|
||||
public void incrementLaunch(String intentStr) {
|
||||
int pos = mIntents.indexOf(intentStr);
|
||||
if (pos < 0) {
|
||||
mIntents.add(intentStr);
|
||||
mHistogram.add(1);
|
||||
} else {
|
||||
mHistogram.set(pos, mHistogram.get(pos) + 1);
|
||||
}
|
||||
}
|
||||
|
||||
public void recordLaunch(Intent intent) {
|
||||
recordLaunch(intent, null);
|
||||
}
|
||||
|
||||
public void recordLaunch(Intent intent, ShortcutInfo shortcut) {
|
||||
public void recordLaunch(View v, Intent intent, ShortcutInfo shortcut) {
|
||||
intent = new Intent(intent);
|
||||
intent.setSourceBounds(null);
|
||||
|
||||
final String flat = intent.toUri(0);
|
||||
|
||||
Intent broadcastIntent = new Intent(ACTION_LAUNCH).putExtra(EXTRA_INTENT, flat);
|
||||
if (shortcut != null) {
|
||||
broadcastIntent.putExtra(EXTRA_CONTAINER, shortcut.container)
|
||||
@@ -123,95 +138,10 @@ public class Stats {
|
||||
.putExtra(EXTRA_CELLX, shortcut.cellX)
|
||||
.putExtra(EXTRA_CELLY, shortcut.cellY);
|
||||
}
|
||||
|
||||
Bundle sourceExtras = LaunchSourceUtils.createSourceData();
|
||||
LaunchSourceUtils.populateSourceDataFromAncestorProvider(v, sourceExtras);
|
||||
broadcastIntent.putExtra(EXTRA_SOURCE, sourceExtras);
|
||||
mLauncher.sendBroadcast(broadcastIntent, mLaunchBroadcastPermission);
|
||||
|
||||
incrementLaunch(flat);
|
||||
|
||||
if (FLUSH_IMMEDIATELY) {
|
||||
saveStats();
|
||||
}
|
||||
|
||||
if (LOCAL_LAUNCH_LOG && mLog != null) {
|
||||
try {
|
||||
mLog.writeInt(LOG_TAG_LAUNCH);
|
||||
mLog.writeLong(System.currentTimeMillis());
|
||||
if (shortcut == null) {
|
||||
mLog.writeShort(0);
|
||||
mLog.writeShort(0);
|
||||
mLog.writeShort(0);
|
||||
mLog.writeShort(0);
|
||||
} else {
|
||||
mLog.writeShort((short) shortcut.container);
|
||||
mLog.writeShort((short) shortcut.screenId);
|
||||
mLog.writeShort((short) shortcut.cellX);
|
||||
mLog.writeShort((short) shortcut.cellY);
|
||||
}
|
||||
mLog.writeUTF(flat);
|
||||
if (FLUSH_IMMEDIATELY) {
|
||||
mLog.flush(); // TODO: delayed writes
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void saveStats() {
|
||||
DataOutputStream stats = null;
|
||||
try {
|
||||
stats = new DataOutputStream(mLauncher.openFileOutput(
|
||||
LauncherFiles.STATS_LOG + ".tmp", Context.MODE_PRIVATE));
|
||||
stats.writeInt(STATS_VERSION);
|
||||
final int N = mHistogram.size();
|
||||
stats.writeInt(N);
|
||||
for (int i=0; i<N; i++) {
|
||||
stats.writeUTF(mIntents.get(i));
|
||||
stats.writeInt(mHistogram.get(i));
|
||||
}
|
||||
stats.close();
|
||||
stats = null;
|
||||
mLauncher.getFileStreamPath(LauncherFiles.STATS_LOG + ".tmp")
|
||||
.renameTo(mLauncher.getFileStreamPath(LauncherFiles.STATS_LOG));
|
||||
} catch (FileNotFoundException e) {
|
||||
Log.e(TAG, "unable to create stats data: " + e);
|
||||
} catch (IOException e) {
|
||||
Log.e(TAG, "unable to write to stats data: " + e);
|
||||
} finally {
|
||||
if (stats != null) {
|
||||
try {
|
||||
stats.close();
|
||||
} catch (IOException e) { }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void loadStats() {
|
||||
mIntents = new ArrayList<String>(INITIAL_STATS_SIZE);
|
||||
mHistogram = new ArrayList<Integer>(INITIAL_STATS_SIZE);
|
||||
DataInputStream stats = null;
|
||||
try {
|
||||
stats = new DataInputStream(mLauncher.openFileInput(LauncherFiles.STATS_LOG));
|
||||
final int version = stats.readInt();
|
||||
if (version == STATS_VERSION) {
|
||||
final int N = stats.readInt();
|
||||
for (int i=0; i<N; i++) {
|
||||
final String pkg = stats.readUTF();
|
||||
final int count = stats.readInt();
|
||||
mIntents.add(pkg);
|
||||
mHistogram.add(count);
|
||||
}
|
||||
}
|
||||
} catch (FileNotFoundException e) {
|
||||
// not a problem
|
||||
} catch (IOException e) {
|
||||
// more of a problem
|
||||
|
||||
} finally {
|
||||
if (stats != null) {
|
||||
try {
|
||||
stats.close();
|
||||
} catch (IOException e) { }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user