diff options
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 11 | ||||
| -rw-r--r-- | core/java/android/view/WindowManagerGlobal.java | 9 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 9 |
3 files changed, 0 insertions, 29 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 6788fee..93c6d6e 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -422,8 +422,6 @@ public final class ViewRootImpl implements ViewParent, synchronized (this) { if (mView == null) { mView = view; - Slog.d(TAG, "setView: b9404689 setting mView to " + view + " mAdded=" + mAdded - + " Callers=" + Debug.getCallers(4)); mViewLayoutDirectionInitial = mView.getRawLayoutDirection(); mFallbackEventHandler.setView(view); mWindowAttributes.copyFrom(attrs); @@ -480,8 +478,6 @@ public final class ViewRootImpl implements ViewParent, = panelParentView.getApplicationWindowToken(); } mAdded = true; - Slog.d(TAG, "setView: b9404689 setting mAdded=true mView=" + mView - + " Callers=" + Debug.getCallers(4)); int res; /* = WindowManagerImpl.ADD_OKAY; */ // Schedule the first layout -before- adding to the window @@ -507,8 +503,6 @@ public final class ViewRootImpl implements ViewParent, mFallbackEventHandler.setView(null); unscheduleTraversals(); setAccessibilityFocus(null, null); - Slog.d(TAG, "setView: b9404689 threw exception e=" + e - + " Callers=" + Debug.getCallers(4)); throw new RuntimeException("Adding window failed", e); } finally { if (restore) { @@ -5164,14 +5158,11 @@ public final class ViewRootImpl implements ViewParent, return; } mRemoved = true; - Slog.d(TAG, "doDie: b9404689 mAdded=" + mAdded + " mView=" + mView - + " Callers=" + Debug.getCallers(4)); if (mAdded) { dispatchDetachedFromWindow(); } if (mAdded && !mFirst) { - Slog.d(TAG, "doDie: b9404689 mAdded && !mFirst"); invalidateDisplayLists(); destroyHardwareRenderer(); @@ -5195,8 +5186,6 @@ public final class ViewRootImpl implements ViewParent, } } - Slog.d(TAG, "doDie: b9404689 setting mAdded=false mView=" + mView - + " Callers=" + Debug.getCallers(4)); mAdded = false; } WindowManagerGlobal.getInstance().doRemoveView(this); diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java index 6666545..b183bb6 100644 --- a/core/java/android/view/WindowManagerGlobal.java +++ b/core/java/android/view/WindowManagerGlobal.java @@ -227,7 +227,6 @@ public final class WindowManagerGlobal { if (index >= 0) { if (mDyingViews.contains(view)) { // Don't wait for MSG_DIE to make it's way through root's queue. - Slog.d(TAG, "addView: b9404689 mDying contains view=" + view); mRoots.get(index).doDie(); } else { throw new IllegalStateException("View " + view @@ -252,7 +251,6 @@ public final class WindowManagerGlobal { view.setLayoutParams(wparams); - Slog.d(TAG, "addView: b9404689 adding view=" + view + " root=" + root); mViews.add(view); mRoots.add(root); mParams.add(wparams); @@ -351,8 +349,6 @@ public final class WindowManagerGlobal { if (view != null) { view.assignParent(null); if (deferred) { - Slog.d(TAG, "removeViewLocked: b9404689 mDyingViews adding view=" + view - + " root=" + root + " Callers=" + Debug.getCallers(4)); mDyingViews.add(view); } } @@ -362,15 +358,10 @@ public final class WindowManagerGlobal { synchronized (mLock) { final int index = mRoots.indexOf(root); if (index >= 0) { - Slog.d(TAG, "doRemoveView: b9404689 removing view=" + mViews.get(index) - + " Callers=" + Debug.getCallers(4)); mRoots.remove(index); mParams.remove(index); final View view = mViews.remove(index); mDyingViews.remove(view); - } else { - Slog.d(TAG, "doRemoveView: b9404689 couldn't find root=" + root - + " Callers=" + Debug.getCallers(4)); } } } diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 5a95f4c..459c92c 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -551,7 +551,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { // System.out.println("Open panel: isOpen=" + st.isOpen); // Already open, return - Slog.d(TAG, "openPanel: b9404689 entry, st=" + st + " decorView=" + st.decorView); if (st.isOpen || isDestroyed()) { return; } @@ -665,8 +664,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { lp.windowAnimations = st.windowAnimations; wm.addView(st.decorView, lp); - Slog.d(TAG, "openPanel: b9404689 setting isOpen true, st=" + st + " decorView=" - + st.decorView); st.isOpen = true; // Log.v(TAG, "Adding main menu to window manager."); } @@ -696,12 +693,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { */ public final void closePanel(PanelFeatureState st, boolean doCallback) { // System.out.println("Close panel: isOpen=" + st.isOpen); - Slog.d(TAG, "closePanel: b9404689 entry, st=" + st + " isOpen=" + st.isOpen - + " decorView=" + st.decorView + " Callers=" + Debug.getCallers(4)); if (doCallback && st.featureId == FEATURE_OPTIONS_PANEL && mActionBar != null && mActionBar.isOverflowMenuShowing()) { checkCloseActionMenu(st.menu); - Slog.d(TAG, "closePanel: b9404689 early return"); return; } @@ -718,8 +712,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (doCallback) { callOnPanelClosed(st.featureId, st, null); } - } else { - Slog.d(TAG, "closePanel: b9404689 not removing wm=" + wm); } st.isPrepared = false; @@ -1108,7 +1100,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { */ protected boolean initializePanelDecor(PanelFeatureState st) { st.decorView = new DecorView(getContext(), st.featureId); - Slog.d(TAG, "initializePanelDecor: b9404689 st=" + st + " decorView=" + st.decorView); st.gravity = Gravity.CENTER | Gravity.BOTTOM; st.setStyle(getContext()); |