Merge "Remove obsolete variable masking valid one."

Craig Mautner · Android (Google) Code Review · commit 15d5a964fd12 · 2012-03-29T18:03:32.000-07:00
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
@@ -600,7 +600,6 @@ class LayoutAndSurfaceFields {
         private boolean mSyswin = false;
         private float mScreenBrightness = -1;
         private float mButtonBrightness = -1;
-        private boolean mUpdateRotation = false;
     }
     LayoutAndSurfaceFields mInnerFields = new LayoutAndSurfaceFields();
 
@@ -8575,17 +8574,17 @@ private final void performLayoutAndPlaceSurfacesLockedInner(
             mTurnOnScreen = false;
         }
 
-        if (mInnerFields.mUpdateRotation) {
+        if (mAnimator.mUpdateRotation) {
             if (DEBUG_ORIENTATION) Slog.d(TAG, "Performing post-rotate rotation");
             if (updateRotationUncheckedLocked(false)) {
                 mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);
             } else {
-                mInnerFields.mUpdateRotation = false;
+                mAnimator.mUpdateRotation = false;
             }
         }
 
         if (mInnerFields.mOrientationChangeComplete && !mLayoutNeeded &&
-                !mInnerFields.mUpdateRotation) {
+                !mAnimator.mUpdateRotation) {
             checkDrawnWindowsLocked();
         }
 
@@ -8924,11 +8923,11 @@ private void startFreezingDisplayLocked(boolean inTransaction) {
                 mAnimator.mScreenRotationAnimation.kill();
                 mAnimator.mScreenRotationAnimation = null;
             }
-            if (mAnimator.mScreenRotationAnimation == null) {
-                mAnimator.mScreenRotationAnimation = new ScreenRotationAnimation(mContext,
-                        mFxSession, inTransaction, mCurDisplayWidth, mCurDisplayHeight,
-                        mDisplay.getRotation());
-            }
+
+            mAnimator.mScreenRotationAnimation = new ScreenRotationAnimation(mContext,
+                    mFxSession, inTransaction, mCurDisplayWidth, mCurDisplayHeight,
+                    mDisplay.getRotation());
+
             if (!mAnimator.mScreenRotationAnimation.hasScreenshot()) {
                 Surface.freezeDisplay(0);
             }
@@ -8943,6 +8942,10 @@ private void stopFreezingDisplayLocked() {
         }
 
         if (mWaitingForConfig || mAppsFreezingScreen > 0 || mWindowsFreezingScreen) {
+            if (DEBUG_ORIENTATION) Slog.d(TAG,
+                "stopFreezingDisplayLocked: Returning mWaitingForConfig=" + mWaitingForConfig
+                + ", mAppsFreezingScreen=" + mAppsFreezingScreen
+                + ", mWindowsFreezingScreen=" + mWindowsFreezingScreen);
             return;
         }
         
diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java
@@ -24,8 +24,6 @@
 import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;
 import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;
 
-import com.android.server.wm.WindowManagerService.H;
-
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Matrix;
@@ -40,15 +38,10 @@
 import android.view.IApplicationToken;
 import android.view.IWindow;
 import android.view.InputChannel;
-import android.view.Surface;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.view.WindowManagerPolicy;
-import android.view.WindowManager.LayoutParams;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Transformation;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -57,6 +50,8 @@
  * A window in the window manager.
  */
 final class WindowState implements WindowManagerPolicy.WindowState {
+    static final String TAG = "WindowState";
+    
     static final boolean DEBUG_VISIBILITY = WindowManagerService.DEBUG_VISIBILITY;
     static final boolean SHOW_TRANSACTIONS = WindowManagerService.SHOW_TRANSACTIONS;
     static final boolean SHOW_LIGHT_TRANSACTIONS = WindowManagerService.SHOW_LIGHT_TRANSACTIONS;
@@ -276,7 +271,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
         mSeq = seq;
         mEnforceSizeCompat = (mAttrs.flags & FLAG_COMPATIBLE_WINDOW) != 0;
         if (WindowManagerService.localLOGV) Slog.v(
-            WindowManagerService.TAG, "Window " + this + " client=" + c.asBinder()
+            TAG, "Window " + this + " client=" + c.asBinder()
             + " token=" + token + " (" + mAttrs.token + ")");
         try {
             c.asBinder().linkToDeath(deathRecipient, 0);
@@ -304,7 +299,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
                     + WindowManagerService.TYPE_LAYER_OFFSET;
             mSubLayer = mPolicy.subWindowTypeToLayerLw(a.type);
             mAttachedWindow = attachedWindow;
-            if (WindowManagerService.DEBUG_ADD_REMOVE) Slog.v(WindowManagerService.TAG, "Adding " + this + " to " + mAttachedWindow);
+            if (WindowManagerService.DEBUG_ADD_REMOVE) Slog.v(TAG, "Adding " + this + " to " + mAttachedWindow);
             mAttachedWindow.mChildWindows.add(this);
             mLayoutAttached = mAttrs.type !=
                     WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
@@ -358,7 +353,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
 
     void attach() {
         if (WindowManagerService.localLOGV) Slog.v(
-            WindowManagerService.TAG, "Attaching " + this + " token=" + mToken
+            TAG, "Attaching " + this + " token=" + mToken
             + ", list=" + mToken.windows);
         mSession.windowAddedLocked();
     }
@@ -496,7 +491,7 @@ public void computeFrameLw(Rect pf, Rect df, Rect cf, Rect vf) {
         if (WindowManagerService.localLOGV) {
             //if ("com.google.android.youtube".equals(mAttrs.packageName)
             //        && mAttrs.type == WindowManager.LayoutParams.TYPE_APPLICATION_PANEL) {
-                Slog.v(WindowManagerService.TAG, "Resolving (mRequestedWidth="
+                Slog.v(TAG, "Resolving (mRequestedWidth="
                         + mRequestedWidth + ", mRequestedheight="
                         + mRequestedHeight + ") to" + " (pw=" + pw + ", ph=" + ph
                         + "): frame=" + mFrame.toShortString()
@@ -600,10 +595,11 @@ public boolean hasAppShownWindows() {
         return mAppToken != null ? mAppToken.firstWindowDrawn : false;
     }
 
+    // TODO(cmautner): Move to WindowStateAnimator
     boolean finishDrawingLocked() {
         if (mDrawPending) {
             if (SHOW_TRANSACTIONS || WindowManagerService.DEBUG_ORIENTATION) Slog.v(
-                WindowManagerService.TAG, "finishDrawingLocked: " + this + " in "
+                TAG, "finishDrawingLocked: " + this + " in "
                         + mWinAnimator.mSurface);
             mCommitDrawPending = true;
             mDrawPending = false;
@@ -612,6 +608,7 @@ boolean finishDrawingLocked() {
         return false;
     }
 
+    // TODO(cmautner): Move to WindowStateAnimator
     // This must be called while inside a transaction.
     boolean commitFinishDrawingLocked(long currentTime) {
         //Slog.i(TAG, "commitFinishDrawingLocked: " + mSurface);
@@ -820,7 +817,7 @@ void removeLocked() {
         disposeInputChannel();
         
         if (mAttachedWindow != null) {
-            if (WindowManagerService.DEBUG_ADD_REMOVE) Slog.v(WindowManagerService.TAG, "Removing " + this + " from " + mAttachedWindow);
+            if (WindowManagerService.DEBUG_ADD_REMOVE) Slog.v(TAG, "Removing " + this + " from " + mAttachedWindow);
             mAttachedWindow.mChildWindows.remove(this);
         }
         mWinAnimator.destroyDeferredSurfaceLocked();
@@ -859,7 +856,7 @@ public void binderDied() {
             try {
                 synchronized(mService.mWindowMap) {
                     WindowState win = mService.windowForClientLocked(mSession, mClient, false);
-                    Slog.i(WindowManagerService.TAG, "WIN DEATH: " + win);
+                    Slog.i(TAG, "WIN DEATH: " + win);
                     if (win != null) {
                         mService.removeWindowLocked(mSession, win);
                     }
@@ -891,9 +888,9 @@ boolean showLw(boolean doAnimation, boolean requestAnim) {
             // Already showing.
             return false;
         }
-        if (DEBUG_VISIBILITY) Slog.v(WindowManagerService.TAG, "Policy visibility true: " + this);
+        if (DEBUG_VISIBILITY) Slog.v(TAG, "Policy visibility true: " + this);
         if (doAnimation) {
-            if (DEBUG_VISIBILITY) Slog.v(WindowManagerService.TAG, "doAnimation: mPolicyVisibility="
+            if (DEBUG_VISIBILITY) Slog.v(TAG, "doAnimation: mPolicyVisibility="
                     + mPolicyVisibility + " mAnimation=" + mWinAnimator.mAnimation);
             if (!mService.okToDisplay()) {
                 doAnimation = false;
@@ -940,7 +937,7 @@ boolean hideLw(boolean doAnimation, boolean requestAnim) {
         if (doAnimation) {
             mPolicyVisibilityAfterAnim = false;
         } else {
-            if (DEBUG_VISIBILITY) Slog.v(WindowManagerService.TAG, "Policy visibility false: " + this);
+            if (DEBUG_VISIBILITY) Slog.v(TAG, "Policy visibility false: " + this);
             mPolicyVisibilityAfterAnim = false;
             mPolicyVisibility = false;
             // Window is no longer visible -- make sure if we were waiting
diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java
@@ -554,7 +554,7 @@ void destroyDeferredSurfaceLocked() {
                 mPendingDestroySurface.destroy();
             }
         } catch (RuntimeException e) {
-            Slog.w(WindowManagerService.TAG, "Exception thrown when destroying Window "
+            Slog.w(TAG, "Exception thrown when destroying Window "
                     + this + " surface " + mPendingDestroySurface
                     + " session " + mSession + ": " + e.toString());
         }
@@ -705,6 +705,7 @@ void computeShownFrameLocked() {
         mDsDy = 0;
         mDtDy = mWin.mGlobalScale;
     }
+
     public void prepareSurfaceLocked(final boolean recoveringMemory) {
         final WindowState w = mWin;
         if (mSurface == null) {
@@ -892,15 +893,15 @@ boolean performShowLocked() {
                 e = new RuntimeException();
                 e.fillInStackTrace();
             }
-            Slog.v(WindowManagerService.TAG, "performShow on " + this
+            Slog.v(TAG, "performShow on " + this
                     + ": readyToShow=" + mWin.mReadyToShow + " readyForDisplay="
                     + mWin.isReadyForDisplay()
                     + " starting=" + (mWin.mAttrs.type == TYPE_APPLICATION_STARTING), e);
         }
         if (mWin.mReadyToShow && mWin.isReadyForDisplay()) {
             if (SHOW_TRANSACTIONS || WindowManagerService.DEBUG_ORIENTATION)
                 WindowManagerService.logSurface(mWin, "SHOW (performShowLocked)", null);
-            if (DEBUG_VISIBILITY) Slog.v(WindowManagerService.TAG, "Showing " + this
+            if (DEBUG_VISIBILITY) Slog.v(TAG, "Showing " + this
                     + " during animation: policyVis=" + mWin.mPolicyVisibility
                     + " attHidden=" + mWin.mAttachedHidden
                     + " tok.hiddenRequested="
@@ -947,7 +948,7 @@ boolean performShowLocked() {
 
                 if (mWin.mAppToken.startingData != null) {
                     if (WindowManagerService.DEBUG_STARTING_WINDOW ||
-                            WindowManagerService.DEBUG_ANIM) Slog.v(WindowManagerService.TAG,
+                            WindowManagerService.DEBUG_ANIM) Slog.v(TAG,
                             "Finish starting " + mWin.mToken
                             + ": first real window is shown, no animation");
                     // If this initial window is animating, stop it -- we
@@ -1059,7 +1060,7 @@ boolean applyAnimationLocked(int transit, boolean isEntrance) {
                     a = mService.loadAnimation(mWin.mAttrs, attr);
                 }
             }
-            if (WindowManagerService.DEBUG_ANIM) Slog.v(WindowManagerService.TAG,
+            if (WindowManagerService.DEBUG_ANIM) Slog.v(TAG,
                     "applyAnimation: win=" + this
                     + " anim=" + anim + " attr=0x" + Integer.toHexString(attr)
                     + " mAnimation=" + mAnimation
@@ -1071,7 +1072,7 @@ boolean applyAnimationLocked(int transit, boolean isEntrance) {
                         e = new RuntimeException();
                         e.fillInStackTrace();
                     }
-                    Slog.v(WindowManagerService.TAG, "Loaded animation " + a + " for " + this, e);
+                    Slog.v(TAG, "Loaded animation " + a + " for " + this, e);
                 }
                 setAnimation(a);
                 mAnimationIsEntrance = isEntrance;

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,6 @@ class LayoutAndSurfaceFields {`
`600`	`600`	`private boolean mSyswin = false;`
`601`	`601`	`private float mScreenBrightness = -1;`
`602`	`602`	`private float mButtonBrightness = -1;`
`603`		`- private boolean mUpdateRotation = false;`
`604`	`603`	`}`
`605`	`604`	`LayoutAndSurfaceFields mInnerFields = new LayoutAndSurfaceFields();`
`606`	`605`
`@@ -8575,17 +8574,17 @@ private final void performLayoutAndPlaceSurfacesLockedInner(`
`8575`	`8574`	`mTurnOnScreen = false;`
`8576`	`8575`	`}`
`8577`	`8576`
`8578`		`- if (mInnerFields.mUpdateRotation) {`
	`8577`	`+ if (mAnimator.mUpdateRotation) {`
`8579`	`8578`	`if (DEBUG_ORIENTATION) Slog.d(TAG, "Performing post-rotate rotation");`
`8580`	`8579`	`if (updateRotationUncheckedLocked(false)) {`
`8581`	`8580`	`mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);`
`8582`	`8581`	`} else {`
`8583`		`- mInnerFields.mUpdateRotation = false;`
	`8582`	`+ mAnimator.mUpdateRotation = false;`
`8584`	`8583`	`}`
`8585`	`8584`	`}`
`8586`	`8585`
`8587`	`8586`	`if (mInnerFields.mOrientationChangeComplete && !mLayoutNeeded &&`
`8588`		`- !mInnerFields.mUpdateRotation) {`
	`8587`	`+ !mAnimator.mUpdateRotation) {`
`8589`	`8588`	`checkDrawnWindowsLocked();`
`8590`	`8589`	`}`
`8591`	`8590`
`@@ -8924,11 +8923,11 @@ private void startFreezingDisplayLocked(boolean inTransaction) {`
`8924`	`8923`	`mAnimator.mScreenRotationAnimation.kill();`
`8925`	`8924`	`mAnimator.mScreenRotationAnimation = null;`
`8926`	`8925`	`}`
`8927`		`- if (mAnimator.mScreenRotationAnimation == null) {`
`8928`		`- mAnimator.mScreenRotationAnimation = new ScreenRotationAnimation(mContext,`
`8929`		`- mFxSession, inTransaction, mCurDisplayWidth, mCurDisplayHeight,`
`8930`		`- mDisplay.getRotation());`
`8931`		`- }`
	`8926`	`+`
	`8927`	`+ mAnimator.mScreenRotationAnimation = new ScreenRotationAnimation(mContext,`
	`8928`	`+ mFxSession, inTransaction, mCurDisplayWidth, mCurDisplayHeight,`
	`8929`	`+ mDisplay.getRotation());`
	`8930`	`+`
`8932`	`8931`	`if (!mAnimator.mScreenRotationAnimation.hasScreenshot()) {`
`8933`	`8932`	`Surface.freezeDisplay(0);`
`8934`	`8933`	`}`
`@@ -8943,6 +8942,10 @@ private void stopFreezingDisplayLocked() {`
`8943`	`8942`	`}`
`8944`	`8943`
`8945`	`8944`	`if (mWaitingForConfig \|\| mAppsFreezingScreen > 0 \|\| mWindowsFreezingScreen) {`
	`8945`	`+ if (DEBUG_ORIENTATION) Slog.d(TAG,`
	`8946`	`+ "stopFreezingDisplayLocked: Returning mWaitingForConfig=" + mWaitingForConfig`
	`8947`	`+ + ", mAppsFreezingScreen=" + mAppsFreezingScreen`
	`8948`	`+ + ", mWindowsFreezingScreen=" + mWindowsFreezingScreen);`
`8946`	`8949`	`return;`
`8947`	`8950`	`}`
`8948`	`8951`