Projects >> platform_frameworks_base >>779a33b779cbdbb22b590a4b9a073b73d0454f3d

Chunk
Conflicting content 
    ArrayList mWinAnimators = new ArrayList();

    boolean mAnimating;
<<<<<<< HEAD

    final Runnable mAnimationRunnable;

=======
    WindowState mWindowAnimationBackground;
    int mWindowAnimationBackgroundColor;
>>>>>>> 64ab8fcd6f2011c0d185f2973b9615f155f6d239
    int mAdjResult;

    int mPendingLayoutChanges;
Solution content 
    ArrayList mWinAnimators = new ArrayList();

    boolean mAnimating;

    final Runnable mAnimationRunnable;

    int mAdjResult;

    int mPendingLayoutChanges;
File
WindowAnimator.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
                    if (win.isReadyForDisplay()) {
                        if (nowAnimating) {
                            if (winAnimator.mAnimationIsEntrance) {
<<<<<<< HEAD
                                forceHiding = KEYGUARD_ANIMATING_IN;
                            } else {
                                forceHiding = KEYGUARD_ANIMATING_OUT;
                            }
                        } else {
                            forceHiding = KEYGUARD_SHOWN;
=======
                                mForceHiding = KEYGUARD_ANIMATING_IN;
                            } else {
                                mForceHiding = KEYGUARD_ANIMATING_OUT;
                            }
                        } else {
                            mForceHiding = KEYGUARD_SHOWN;
>>>>>>> 64ab8fcd6f2011c0d185f2973b9615f155f6d239
                        }
                    }
                    if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
Solution content 
                    if (win.isReadyForDisplay()) {
                        if (nowAnimating) {
                            if (winAnimator.mAnimationIsEntrance) {
                                forceHiding = KEYGUARD_ANIMATING_IN;
                            } else {
                                forceHiding = KEYGUARD_ANIMATING_OUT;
                            }
                        } else {
                            forceHiding = KEYGUARD_SHOWN;
                        }
                    }
                    if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
File
WindowAnimator.java
Developer's decision
Version 1
Kind of conflict
Attribute
Variable
Chunk
Conflicting content 
=======
                    final boolean hideWhenLocked =
                            (winAnimator.mAttrFlags & FLAG_SHOW_WHEN_LOCKED) == 0;
                    final boolean changed;
<<<<<<< HEAD
                    if (((forceHiding == KEYGUARD_ANIMATING_IN)
                                && (!winAnimator.isAnimating() || hideWhenLocked))
                            || ((forceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) {
                    if (((mForceHiding == KEYGUARD_ANIMATING_IN)
                                && (!winAnimator.isAnimating() || hideWhenLocked))
                            || ((mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) {
>>>>>>> 64ab8fcd6f2011c0d185f2973b9615f155f6d239
                        changed = win.hideLw(false, false);
                        if (WindowManagerService.DEBUG_VISIBILITY && changed) Slog.v(TAG,
                                "Now policy hidden: " + win);
Solution content 
                    final boolean hideWhenLocked =
                            (winAnimator.mAttrFlags & FLAG_SHOW_WHEN_LOCKED) == 0;
                    final boolean changed;
                    if (((forceHiding == KEYGUARD_ANIMATING_IN)
                                && (!winAnimator.isAnimating() || hideWhenLocked))
                            || ((forceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) {
                        changed = win.hideLw(false, false);
                        if (WindowManagerService.DEBUG_VISIBILITY && changed) Slog.v(TAG,
                                "Now policy hidden: " + win);
File
WindowAnimator.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
    }

    private void performAnimationsLocked() {
<<<<<<< HEAD
        updateWindowsLocked();
        updateWallpaperLocked();
=======
        mForceHiding = KEYGUARD_NOT_SHOWN;
        mDetachedWallpaper = null;
        mWindowAnimationBackground = null;
        mWindowAnimationBackgroundColor = 0;
>>>>>>> 64ab8fcd6f2011c0d185f2973b9615f155f6d239

        if ((mPendingLayoutChanges & WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER) != 0) {
            mPendingActions |= WALLPAPER_ACTION_PENDING;
Solution content 
    }

    private void performAnimationsLocked() {
        updateWindowsLocked();
        updateWallpaperLocked();

        if ((mPendingLayoutChanges & WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER) != 0) {
            mPendingActions |= WALLPAPER_ACTION_PENDING;
File
WindowAnimator.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation