Projects >> platform_frameworks_base >>476fceaba3e8c8d5b775fc07ad098792fc757f76

Chunk
Conflicting content 
        if (scrollState == SlidingChallengeLayout.SCROLL_STATE_IDLE) {

    @Override
    public void onScrollStateChanged(int scrollState) {
<<<<<<< HEAD
        if (mPagedView == null || mChallengeLayout == null) return;
=======
        if (mKeyguardWidgetPager == null || mChallengeLayout == null) return;

>>>>>>> 5418dd92ac6a0e60493ea85d9ac3a0f0d6155908
        boolean challengeOverlapping = mChallengeLayout.isChallengeOverlapping();
Solution content 
        if (mPagedView == null || mChallengeLayout == null) return;


    @Override
        boolean challengeOverlapping = mChallengeLayout.isChallengeOverlapping();

        if (scrollState == SlidingChallengeLayout.SCROLL_STATE_IDLE) {
    public void onScrollStateChanged(int scrollState) {
File
KeyguardViewStateManager.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
<<<<<<< HEAD
            if (!mChallengeLayout.isBouncing()) {
                frame.showFrame(this);
            // As soon as the security begins sliding, the widget becomes small (if it wasn't
            // small to begin with).
            if (!frame.isSmall()) {
                // We need to fetch the final page, in case the pages are in motion.
                mPageListeningToSlider = mPagedView.getNextPage();
                frame.shrinkWidget();
=======
                // As soon as the security begins sliding, the widget becomes small (if it wasn't
                // small to begin with).
                if (!frame.isSmall()) {
                    // We need to fetch the final page, in case the pages are in motion.
                    mPageListeningToSlider = mKeyguardWidgetPager.getNextPage();
                    frame.shrinkWidget();
                }
            } else {
                if (!frame.isSmall()) {
                    // We need to fetch the final page, in case the pages are in motion.
                    mPageListeningToSlider = mKeyguardWidgetPager.getNextPage();
                }
>>>>>>> 5418dd92ac6a0e60493ea85d9ac3a0f0d6155908
            }

            // View is on the move.  Pause the security view until it completes.
Solution content 
            if (!mChallengeLayout.isBouncing()) {
                frame.showFrame(this);

                    mPageListeningToSlider = mPagedView.getNextPage();
                }
            }

                // As soon as the security begins sliding, the widget becomes small (if it wasn't
                // small to begin with).
                if (!frame.isSmall()) {
                    // We need to fetch the final page, in case the pages are in motion.
                    mPageListeningToSlider = mPagedView.getNextPage();
                    frame.shrinkWidget();
                }
            } else {
                if (!frame.isSmall()) {
                    // We need to fetch the final page, in case the pages are in motion.
            // View is on the move.  Pause the security view until it completes.
File
KeyguardViewStateManager.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
If statement
Method invocation
Chunk
Conflicting content 
    private boolean mCameraWidgetEnabled;

<<<<<<< HEAD
    // Background threads to deal with persistence
    private HandlerThread mBgPersistenceWorkerThread;
    private Handler mBgPersistenceWorkerHandler;
=======
    private int mWidgetToResetAfterFadeOut;

    // Bouncer
    protected int BOUNCER_ZOOM_IN_OUT_DURATION = 250;
    private float BOUNCER_SCALE_FACTOR = 0.67f;

    // Background worker thread: used here for persistence, also made available to widget frames
    private final HandlerThread mBackgroundWorkerThread;
    private final Handler mBackgroundWorkerHandler;
>>>>>>> 5418dd92ac6a0e60493ea85d9ac3a0f0d6155908

    public KeyguardWidgetPager(Context context, AttributeSet attrs) {
        this(context, attrs, 0);
Solution content 
    private boolean mCameraWidgetEnabled;

    // Bouncer
    protected int BOUNCER_ZOOM_IN_OUT_DURATION = 250;
    private float BOUNCER_SCALE_FACTOR = 0.67f;

    // Background threads to deal with persistence
    private HandlerThread mBgPersistenceWorkerThread;
    private Handler mBgPersistenceWorkerHandler;

    public KeyguardWidgetPager(Context context, AttributeSet attrs) {
        this(context, attrs, 0);
File
KeyguardWidgetPager.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment