commit 187f9665f69745518ebc65327bd662cab3f90cb8
author Sunny Goyal <sunnygoyal@google.com> Fri Jun 26 01:34:44 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 26 01:34:45 2015 +0000
tree b952bbbdc213d63c891371d6015e61f80f7c6454
parent 72db10a93c41fd3c53fdfefad52bad11d9728597
parent 4e5cc64eaf1f63d866d51ce0a6bbafb3d4085c21

Merge "Fixing backup restore" into ub-launcher3-burnaby

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 873ca32..1fb8e8d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -93,8 +93,10 @@
             </intent-filter>
         </activity>
 
+        <!-- ENABLE_FOR_TESTING
+
         <activity
-            android:name="com.android.launcher3.LauncherExtension"
+            android:name="com.android.launcher3.testing.LauncherExtension"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"
@@ -110,6 +112,8 @@
             </intent-filter>
         </activity>
 
+        -->
+
         <activity
             android:name="com.android.launcher3.ToggleWeightWatcher"
             android:label="@string/toggle_weight_watcher"

src/com/android/launcher3/testing/LauncherExtension.java

diff --git a/src/com/android/launcher3/LauncherExtension.java b/src/com/android/launcher3/testing/LauncherExtension.java
similarity index 96%
rename from src/com/android/launcher3/LauncherExtension.java
rename to src/com/android/launcher3/testing/LauncherExtension.java
index 857ec57..b7a0729 100644
--- a/src/com/android/launcher3/LauncherExtension.java
+++ b/src/com/android/launcher3/testing/LauncherExtension.java
@@ -1,7 +1,6 @@
-package com.android.launcher3;
+package com.android.launcher3.testing;
 
 import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.ComponentName;
@@ -11,6 +10,13 @@
 import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
+
+import com.android.launcher3.AppInfo;
+import com.android.launcher3.InsettableFrameLayout;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAnimUtils;
+import com.android.launcher3.LauncherCallbacks;
+import com.android.launcher3.R;
 import com.android.launcher3.allapps.AllAppsSearchBarController;
 import com.android.launcher3.util.ComponentKey;