PagedView: Transition Effects

Conflicts:
	res/layout/overview_panel.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/dimens.xml
	res/values/preferences_defaults.xml
	src/com/android/launcher3/AppsCustomizePagedView.java
	src/com/android/launcher3/Launcher.java
	src/com/android/launcher3/PagedView.java
	src/com/android/launcher3/Workspace.java
	src/com/android/launcher3/settings/SettingsProvider.java

Change-Id: Ib134705952877165c334181548d577b3dceece68

1 files changed, 17 insertions, 7 deletions

diff --git a/src/com/android/launcher3/Stats.java b/src/com/android/launcher3/Stats.java
index f3977e456..6ba1c19b9 100644
--- a/src/com/android/launcher3/Stats.java
+++ b/src/com/android/launcher3/Stats.java
@@ -32,6 +32,7 @@ public class Stats {
     private static final boolean LOCAL_LAUNCH_LOG = true;
 
     public static final String ACTION_LAUNCH = "com.android.launcher3.action.LAUNCH";
+    public static final String PERM_LAUNCH = "com.android.launcher3.permission.RECEIVE_LAUNCH_BROADCASTS";
     public static final String EXTRA_INTENT = "intent";
     public static final String EXTRA_CONTAINER = "container";
     public static final String EXTRA_SCREEN = "screen";
@@ -52,8 +53,6 @@ public class Stats {
 
     private final Launcher mLauncher;
 
-    private final String mLaunchBroadcastPermission;
-
     DataOutputStream mLog;
 
     ArrayList<String> mIntents;
@@ -62,9 +61,6 @@ public class Stats {
     public Stats(Launcher launcher) {
         mLauncher = launcher;
 
-        mLaunchBroadcastPermission =
-                launcher.getResources().getString(R.string.receive_launch_broadcasts_permission);
-
         loadStats();
 
         if (LOCAL_LAUNCH_LOG) {
@@ -91,7 +87,7 @@ public class Stats {
                         }
                     },
                     new IntentFilter(ACTION_LAUNCH),
-                    mLaunchBroadcastPermission,
+                    PERM_LAUNCH,
                     null
             );
         }
@@ -107,6 +103,20 @@ public class Stats {
         }
     }
 
+    public int launchCount(Intent intent) {
+        intent = new Intent(intent);
+        intent.setSourceBounds(null);
+
+        final String flat = intent.toUri(0);
+
+        int pos = mIntents.indexOf(flat);
+        if (pos < 0) {
+            return 0;
+        } else {
+            return mHistogram.get(pos);
+        }
+    }
+
     public void recordLaunch(Intent intent) {
         recordLaunch(intent, null);
     }
@@ -124,7 +134,7 @@ public class Stats {
                     .putExtra(EXTRA_CELLX, shortcut.cellX)
                     .putExtra(EXTRA_CELLY, shortcut.cellY);
         }
-        mLauncher.sendBroadcast(broadcastIntent, mLaunchBroadcastPermission);
+        mLauncher.sendBroadcast(broadcastIntent, PERM_LAUNCH);
 
         incrementLaunch(flat);