Projects >> platform_frameworks_base >>584dafede75ea356bc18d311eab748b625591e23

Chunk
Conflicting content 
    private static final String TAG = "KeyguardViewHost";
    private AppWidgetHost mAppWidgetHost;
    private KeyguardWidgetPager mAppWidgetContainer;
<<<<<<< HEAD
    private ViewFlipper mSecurityViewContainer;
=======
    private ViewFlipper mViewFlipper;
>>>>>>> 24637410fec30fc53a7ca6a0d5f1b28f0b0e886e
    private boolean mEnableMenuKey;
    private boolean mIsVerifyUnlockOnly;
    private boolean mEnableFallback; // TODO: This should get the value from KeyguardPatternView
Solution content 
    private static final String TAG = "KeyguardViewHost";
    private AppWidgetHost mAppWidgetHost;
    private KeyguardWidgetPager mAppWidgetContainer;
    private ViewFlipper mSecurityViewContainer;
    private boolean mEnableMenuKey;
    private boolean mIsVerifyUnlockOnly;
    private boolean mEnableFallback; // TODO: This should get the value from KeyguardPatternView
File
KeyguardHostView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
        for (int i = 0; i < children; i++) {
            updateSecurityView(mSecurityViewContainer.getChildAt(i));
        }
<<<<<<< HEAD
    }

    private void updateSecurityView(View view) {
        if (view instanceof KeyguardSecurityView) {
            KeyguardSecurityView ksv = (KeyguardSecurityView) view;
            ksv.setKeyguardCallback(mCallback);
            ksv.setLockPatternUtils(mLockPatternUtils);
        } else {
            Log.w(TAG, "View " + view + " is not a KeyguardSecurityView");
        }
=======
>>>>>>> 24637410fec30fc53a7ca6a0d5f1b28f0b0e886e
    }

    void setLockPatternUtils(LockPatternUtils utils) {
Solution content 
        for (int i = 0; i < children; i++) {
            updateSecurityView(mSecurityViewContainer.getChildAt(i));
        }
    }

    private void updateSecurityView(View view) {
        if (view instanceof KeyguardSecurityView) {
            KeyguardSecurityView ksv = (KeyguardSecurityView) view;
            ksv.setKeyguardCallback(mCallback);
            ksv.setLockPatternUtils(mLockPatternUtils);
        } else {
            Log.w(TAG, "View " + view + " is not a KeyguardSecurityView");
        }
    }

    void setLockPatternUtils(LockPatternUtils utils) {
File
KeyguardHostView.java
Developer's decision
Version 1
Kind of conflict
If statement
Method signature
Chunk
Conflicting content 
    @Override
    public void onScreenTurnedOn() {
        if (DEBUG) Log.d(TAG, "screen on");
<<<<<<< HEAD
        showSecurityScreen(mCurrentSecuritySelection);
        getSecurityView(mCurrentSecuritySelection).onResume();
=======
        showSecurityScreen(mCurrentSecurityId);
        getSecurityView(mCurrentSecurityId).onResume();
>>>>>>> 24637410fec30fc53a7ca6a0d5f1b28f0b0e886e
    }

    @Override
Solution content 
    @Override
    public void onScreenTurnedOn() {
        if (DEBUG) Log.d(TAG, "screen on");
        showSecurityScreen(mCurrentSecuritySelection);
        getSecurityView(mCurrentSecuritySelection).onResume();
    }

    @Override
File
KeyguardHostView.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    @Override
    public void onScreenTurnedOff() {
        if (DEBUG) Log.d(TAG, "screen off");
<<<<<<< HEAD
        showSecurityScreen(SecurityMode.None);
        getSecurityView(mCurrentSecuritySelection).onPause();
=======
        showSecurityScreen(SECURITY_SELECTOR_ID);
        getSecurityView(mCurrentSecurityId).onPause();
>>>>>>> 24637410fec30fc53a7ca6a0d5f1b28f0b0e886e
    }

    @Override
Solution content 
    @Override
    public void onScreenTurnedOff() {
        if (DEBUG) Log.d(TAG, "screen off");
        showSecurityScreen(SecurityMode.None);
        getSecurityView(mCurrentSecuritySelection).onPause();
    }

    @Override
File
KeyguardHostView.java
Developer's decision
Version 1
Kind of conflict
Method invocation