Projects >> platform_frameworks_base >>c7becb7ee78881646251ff4846e63eb6b96bf7ec

Chunk
Conflicting content 
                            mFinalSystemInsets.set(mDispatchedOverscanInsets);
                            mFinalStableInsets.set(mDispatchedStableInsets);
                            WindowInsets insets = new WindowInsets(mFinalSystemInsets,
<<<<<<< HEAD
                                    null, mFinalStableInsets,
                                    getResources().getConfiguration().isScreenRound());
=======
                                    null, mFinalStableInsets, mWindowIsRound);
                            if (DEBUG) {
                                Log.v(TAG, "dispatching insets=" + insets);
                            }
>>>>>>> 47249f2a9e49aa9626369517315eafc6b42fd8e9
                            onApplyWindowInsets(insets);
                        }
Solution content 
                            mFinalSystemInsets.set(mDispatchedOverscanInsets);
                            mFinalStableInsets.set(mDispatchedStableInsets);
                            WindowInsets insets = new WindowInsets(mFinalSystemInsets,
                                    null, mFinalStableInsets,
                                    getResources().getConfiguration().isScreenRound());
                            if (DEBUG) {
                                Log.v(TAG, "dispatching insets=" + insets);
                            }
                            onApplyWindowInsets(insets);
                        }
File
WallpaperService.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Method invocation
Chunk
Conflicting content 
    }

    void dispatchApplyInsets(View host) {
<<<<<<< HEAD
        host.dispatchApplyWindowInsets(getWindowInsets(true /* forceConstruct */));
=======
        mDispatchContentInsets.set(mAttachInfo.mContentInsets);
        mDispatchStableInsets.set(mAttachInfo.mStableInsets);
        Rect outsets = mAttachInfo.mOutsets;
        Rect contentInsets = mDispatchContentInsets;
        if (outsets.left > 0 || outsets.top > 0 || outsets.right > 0 || outsets.bottom > 0) {
            contentInsets = new Rect(contentInsets.left + outsets.left,
                    contentInsets.top + outsets.top, contentInsets.right + outsets.right,
                    contentInsets.bottom + outsets.bottom);
        }
        host.dispatchApplyWindowInsets(new WindowInsets(contentInsets, null /* windowDecorInsets */,
                mDispatchStableInsets, mWindowIsRound));
>>>>>>> 47249f2a9e49aa9626369517315eafc6b42fd8e9
    }

    private void performTraversals() {
Solution content 
    }

    void dispatchApplyInsets(View host) {
        host.dispatchApplyWindowInsets(getWindowInsets(true /* forceConstruct */));
    }

    private void performTraversals() {
File
ViewRootImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation
Variable
Chunk
Conflicting content 
            return resources.getInteger(com.android.internal.R.integer.config_windowOutsetBottom);
        }
    }
<<<<<<< HEAD
=======

    /**
     * Get whether a device has has a round screen.
     */
    public static boolean getWindowIsRound(Resources resources) {
        if (IS_EMULATOR) {
            return SystemProperties.getBoolean(ViewRootImpl.PROPERTY_EMULATOR_CIRCULAR, false);
        } else {
            return resources.getBoolean(com.android.internal.R.bool.config_windowIsRound);
        }
    }
>>>>>>> 47249f2a9e49aa9626369517315eafc6b42fd8e9
}
Solution content 
            return resources.getInteger(com.android.internal.R.integer.config_windowOutsetBottom);
        }
    }
}
File
ScreenShapeHelper.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
        if (stack == null) {
            return false;
        }
    public boolean isDimming() {
        TaskStack stack = getStack();
        }
        return displayContent.isDefaultDisplay;
    }
<<<<<<< HEAD

    @Override
        return stack.isDimming(mWinAnimator);
    }

=======
    
>>>>>>> 47249f2a9e49aa9626369517315eafc6b42fd8e9
    public void setShowToOwnerOnlyLocked(boolean showToOwnerOnly) {
        mShowToOwnerOnly = showToOwnerOnly;
    }
Solution content 
        }
        return displayContent.isDefaultDisplay;
    }

    @Override
    public boolean isDimming() {
        TaskStack stack = getStack();
        if (stack == null) {
            return false;
        }
        return stack.isDimming(mWinAnimator);
    }

    public void setShowToOwnerOnlyLocked(boolean showToOwnerOnly) {
        mShowToOwnerOnly = showToOwnerOnly;
    }
File
WindowState.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration