Projects >> platform_frameworks_base >>70cdb408cb4602b02f0c1e3252a528af74d55436

Chunk
Conflicting content 
     */
    private final LockPatternUtils mLockPatternUtils;

<<<<<<< HEAD
    private int mNumAccounts;
=======
    private boolean mIsPortrait;
>>>>>>> 79ebdf2142ec90b311466ec22d89a38c2971bbf0

    /**
     * @return Whether we are stuck on the lock screen because the sim is
Solution content 
     */
    private final LockPatternUtils mLockPatternUtils;

    private int mNumAccounts;
    private boolean mIsPortrait;

    /**
     * @return Whether we are stuck on the lock screen because the sim is
File
LockPatternKeyguardView.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
=======

    // TODO:
    // This overloaded method was added to workaround a race condition in the framework between
    // notification for orientation changed, layout() and switching resources.  This code attempts
    // to avoid drawing the incorrect layout while things are in transition.  The method can just
    // be removed once the race condition is fixed. See bugs 2262578 and 2292713.
    @Override
    protected void dispatchDraw(Canvas canvas) {
        final int orientation = getResources().getConfiguration().orientation;
        if (mIsPortrait && Configuration.ORIENTATION_PORTRAIT != orientation
                || getResources().getBoolean(R.bool.lockscreen_isPortrait) != mIsPortrait) {
            // Make sure we redraw once things settle down.
            // Log.v(TAG, "dispatchDraw(): not drawing because state is inconsistent");
            postInvalidate();

            // In order to minimize flashing, draw the first child's background for now.
            ViewGroup view = (ViewGroup) (mMode == Mode.LockScreen ? mLockScreen : mUnlockScreen);
            if (view != null && view.getChildAt(0) != null) {
                Drawable background = view.getChildAt(0).getBackground();
                if (background != null) {
                    background.draw(canvas);
                }
            }
            return;
        }
        super.dispatchDraw(canvas);
    }

>>>>>>> 79ebdf2142ec90b311466ec22d89a38c2971bbf0
    @Override
    public void reset() {
        mIsVerifyUnlockOnly = false;
Solution content 
        }
    }


    // TODO:
    // This overloaded method was added to workaround a race condition in the framework between
    // notification for orientation changed, layout() and switching resources.  This code attempts
    // to avoid drawing the incorrect layout while things are in transition.  The method can just
    // be removed once the race condition is fixed. See bugs 2262578 and 2292713.
    @Override
    protected void dispatchDraw(Canvas canvas) {
        final int orientation = getResources().getConfiguration().orientation;
        if (mIsPortrait && Configuration.ORIENTATION_PORTRAIT != orientation
                || getResources().getBoolean(R.bool.lockscreen_isPortrait) != mIsPortrait) {
            // Make sure we redraw once things settle down.
            // Log.v(TAG, "dispatchDraw(): not drawing because state is inconsistent");
            postInvalidate();

            // In order to minimize flashing, draw the first child's background for now.
            ViewGroup view = (ViewGroup) (mMode == Mode.LockScreen ? mLockScreen : mUnlockScreen);
            if (view != null && view.getChildAt(0) != null) {
                Drawable background = view.getChildAt(0).getBackground();
                if (background != null) {
                    background.draw(canvas);
                }
            }
            return;
        }
        super.dispatchDraw(canvas);
    }

    @Override
    public void reset() {
        mIsVerifyUnlockOnly = false;
File
LockPatternKeyguardView.java
Developer's decision
Version 2
Kind of conflict
Annotation
Comment
Method declaration