diff options
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 24 | ||||
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizeTabHost.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 11 | ||||
| -rw-r--r-- | src/com/android/launcher2/PagedView.java | 5 |
4 files changed, 0 insertions, 42 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index a24bfdaf2..a50836168 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -361,8 +361,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen if (getImportantForAccessibility() == View.IMPORTANT_FOR_ACCESSIBILITY_AUTO) { setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); } - - Log.d(TAG, "6549598 ctor mNumWidgetPages: " + mNumWidgetPages + " mNumAppsPages: " + mNumAppsPages); } @Override @@ -373,7 +371,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen Context context = getContext(); Resources r = context.getResources(); setDragSlopeThreshold(r.getInteger(R.integer.config_appsCustomizeDragSlopeThreshold)/100f); - Log.d(TAG, "6549598 init mNumWidgetPages: " + mNumWidgetPages + " mNumAppsPages: " + mNumAppsPages); } @Override @@ -444,12 +441,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen mNumWidgetPages = (int) Math.ceil(mWidgets.size() / (float) (mWidgetCountX * mWidgetCountY)); mNumAppsPages = (int) Math.ceil((float) mApps.size() / (mCellCountX * mCellCountY)); - Log.d(TAG, "6549598 updatePageCounts mNumWidgetPages: " + mNumWidgetPages + " mNumAppsPages: " + mNumAppsPages); - Log.d(TAG, "6549598 mApps.size(): " + mApps.size() + " mWidgets.size(): " + mWidgets.size() + " mCellCountX: " + mCellCountX + " mCellCountY: " + mCellCountY); } protected void onDataReady(int width, int height) { - Log.d(TAG, "6549598 onDataReady"); // Note that we transpose the counts in portrait so that we get a similar layout boolean isLandscape = getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; @@ -535,7 +529,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } public void onPackagesUpdated() { - Log.d(TAG, "6549598 onPackagesUpdated"); // TODO: this isn't ideal, but we actually need to delay here. This call is triggered // by a broadcast receiver, and in order for it to work correctly, we need to know that // the AppWidgetService has already received and processed the same broadcast. Since there @@ -578,7 +571,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen mWidgets.addAll(shortcuts); Collections.sort(mWidgets, new LauncherModel.WidgetAndShortcutNameComparator(mPackageManager)); - Log.d(TAG, "6549598 updatePackages mWidgets.size(): " + mWidgets.size()); updatePageCounts(); invalidateOnDataChange(); } @@ -898,7 +890,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen @Override public void onLauncherTransitionEnd(Launcher l, boolean animated, boolean toWorkspace) { - Log.d(TAG, "6549598 onLauncherTransitionEnd mDeferredSyncWidgetPageItems.size(): " + mDeferredSyncWidgetPageItems.size()); mInTransition = false; for (AsyncTaskPageData d : mDeferredSyncWidgetPageItems) { onSyncWidgetPageItems(d); @@ -995,7 +986,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } public void setContentType(ContentType type) { - Log.d(TAG, "6549598 setContentType mNumAppsPages: " + mNumAppsPages); if (type == ContentType.Widgets) { invalidatePageData(mNumAppsPages, true); } else if (type == ContentType.Applications) { @@ -1022,7 +1012,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } private void updateCurrentTab(int currentPage) { - Log.d(TAG, "6549598 updateCurrentTab mNumAppsPages: " + mNumAppsPages); AppsCustomizeTabHost tabHost = getTabHost(); if (tabHost != null) { String tag = tabHost.getCurrentTabTag(); @@ -1066,7 +1055,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } public void syncAppsPageItems(int page, boolean immediate) { - Log.d(TAG, "6549598 syncAppsPageItems page: " + page + " mNumAppsPages: " + mNumAppsPages); // ensure that we have the right number of items on the pages int numCells = mCellCountX * mCellCountY; int startIndex = page * numCells; @@ -1389,7 +1377,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } public void syncWidgetPageItems(final int page, final boolean immediate) { - Log.d(TAG, "6549598 syncWidgetPageItems page: " + page); int numItemsPerPage = mWidgetCountX * mWidgetCountY; // Calculate the dimensions of each cell we are giving to each widget @@ -1585,13 +1572,10 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen setupPage(layout); addView(layout); } - - Log.d(TAG, "6549598 syncPages mNumAppsPages: " + mNumAppsPages + " mNumWidgetPages: " + mNumWidgetPages); } @Override public void syncPageItems(int page, boolean immediate) { - Log.d(TAG, "6549598 syncPageItems page: " + page + " immediate: " + immediate); if (page < mNumAppsPages) { syncAppsPageItems(page, immediate); } else { @@ -1743,7 +1727,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen public void setApps(ArrayList<ApplicationInfo> list) { mApps = list; Collections.sort(mApps, LauncherModel.APP_NAME_COMPARATOR); - Log.d(TAG, "6549598 setApps mApps.size(): " + mApps.size()); updatePageCounts(); invalidateOnDataChange(); } @@ -1761,10 +1744,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen @Override public void addApps(ArrayList<ApplicationInfo> list) { addAppsWithoutInvalidate(list); - Log.d(TAG, "6549598 addApps mApps.size(): " + mApps.size() + " list.size(): " + list.size()); updatePageCounts(); invalidateOnDataChange(); - Log.d(TAG, "6549598 addApps mNumAppsPages: " + mNumAppsPages); } private int findAppByComponent(List<ApplicationInfo> list, ApplicationInfo item) { ComponentName removeComponent = item.intent.getComponent(); @@ -1791,10 +1772,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen @Override public void removeApps(ArrayList<ApplicationInfo> list) { removeAppsWithoutInvalidate(list); - Log.d(TAG, "6549598 removeApps mApps.size(): " + mApps.size() + " list.size(): " + list.size()); updatePageCounts(); invalidateOnDataChange(); - Log.d(TAG, "6549598 removeApps mNumAppsPages: " + mNumAppsPages); } @Override public void updateApps(ArrayList<ApplicationInfo> list) { @@ -1803,15 +1782,12 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen // place in the list. removeAppsWithoutInvalidate(list); addAppsWithoutInvalidate(list); - Log.d(TAG, "6549598 updateApps mApps.size(): " + mApps.size() + " list.size(): " + list.size()); updatePageCounts(); invalidateOnDataChange(); - Log.d(TAG, "6549598 updateApps mNumAppsPages: " + mNumAppsPages); } @Override public void reset() { - Log.d(TAG, "6549598 reset"); // If we have reset, then we should not continue to restore the previous state mSaveInstanceStateItemIndex = -1; diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java index 6bd97a2f2..9fa2f3237 100644 --- a/src/com/android/launcher2/AppsCustomizeTabHost.java +++ b/src/com/android/launcher2/AppsCustomizeTabHost.java @@ -393,7 +393,6 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona // Make sure the current page is loaded (we start loading the side pages after the // transition to prevent slowing down the animation) - Log.d(LOG_TAG, "6549598 onLauncherTransitionPrepare currentPage: " + mAppsCustomizePane.getCurrentPage()); mAppsCustomizePane.loadAssociatedPages(mAppsCustomizePane.getCurrentPage(), true); if (!LauncherApplication.isScreenLarge()) { @@ -436,7 +435,6 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona mAppsCustomizePane.showAllAppsCling(); // Make sure adjacent pages are loaded (we wait until after the transition to // prevent slowing down the animation) - Log.d(LOG_TAG, "6549598 onLauncherTransitionEnd currentPage: " + mAppsCustomizePane.getCurrentPage()); mAppsCustomizePane.loadAssociatedPages(mAppsCustomizePane.getCurrentPage()); if (!LauncherApplication.isScreenLarge()) { diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index fc522aa8d..f4180cd00 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -357,7 +357,6 @@ public final class Launcher extends Activity // Update customization drawer _after_ restoring the states if (mAppsCustomizeContent != null) { - Log.d(TAG, "6549598 Launcher.onCreate()"); mAppsCustomizeContent.onPackagesUpdated(); } @@ -2292,11 +2291,6 @@ public final class Launcher extends Activity } private void dispatchOnLauncherTransitionStart(View v, boolean animated, boolean toWorkspace) { - if (toWorkspace) { - Log.d(TAG, "6549598 Start animation to workspace"); - } else { - Log.d(TAG, "6549598 Start animation to all apps"); - } if (v instanceof LauncherTransitionable) { ((LauncherTransitionable) v).onLauncherTransitionStart(this, animated, toWorkspace); } @@ -2312,11 +2306,6 @@ public final class Launcher extends Activity } private void dispatchOnLauncherTransitionEnd(View v, boolean animated, boolean toWorkspace) { - if (toWorkspace) { - Log.d(TAG, "6549598 End animation to workspace"); - } else { - Log.d(TAG, "6549598 End animation to all apps"); - } if (v instanceof LauncherTransitionable) { ((LauncherTransitionable) v).onLauncherTransitionEnd(this, animated, toWorkspace); } diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index 19f6a62a7..ad0baf44d 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -234,7 +234,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc mDirtyPageContent.ensureCapacity(32); mScroller = new Scroller(getContext(), new ScrollInterpolator()); mCurrentPage = 0; - if (this instanceof AppsCustomizePagedView) Log.d(TAG, "6549598 init() mCurrentPage: " + mCurrentPage); mCenterPagesVertically = true; final ViewConfiguration configuration = ViewConfiguration.get(getContext()); @@ -320,7 +319,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc mCurrentPage = Math.max(0, Math.min(currentPage, getPageCount() - 1)); - if (this instanceof AppsCustomizePagedView) Log.d(TAG, "6549598 setCurrentPage mCurrentPage: " + mCurrentPage); updateCurrentPageScroll(); updateScrollingIndicator(); notifyPageSwitchListener(); @@ -1676,7 +1674,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } protected void invalidatePageData(int currentPage, boolean immediateAndOnly) { if (!mIsDataReady) { - if (this instanceof AppsCustomizePagedView) Log.d(TAG, "6549598 invalidatePageData page: " + currentPage + " not data ready"); return; } @@ -1708,8 +1705,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // Load any pages that are necessary for the current window of views loadAssociatedPages(mCurrentPage, immediateAndOnly); requestLayout(); - - if (this instanceof AppsCustomizePagedView) Log.d(TAG, "6549598 invalidatePageData page: " + currentPage); } } |