Projects >> apptentive-android >>69c67488401fd8662e713b216a684540fb5b2822

Chunk
Conflicting content 
import android.content.SharedPreferences;
import android.os.Bundle;
import android.view.ViewGroup;
<<<<<<< HEAD
import android.view.WindowManager;
=======
import android.view.Window;
import android.view.WindowManager;
import android.widget.Toast;
>>>>>>> 424faa4f080778205f883271b49f37b81f7000ad

import com.apptentive.android.sdk.ApptentiveInternal;
import com.apptentive.android.sdk.Log;
Solution content 
import android.content.SharedPreferences;
import android.os.Bundle;
import android.view.ViewGroup;
import android.view.WindowManager;

import com.apptentive.android.sdk.ApptentiveInternal;
import com.apptentive.android.sdk.Log;
File
MessageCenterActivityContent.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
		// Give the MessageCenterView a callback when a message is sent.
		MessageManager.setAfterSendMessageListener(messageCenterView);

<<<<<<< HEAD
		activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED |
				WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);

		messageCenterView.scrollMessageListViewToBottom();
=======
		// Needed to prevent the window from being pushed up when a text input area is focused.
		Window window = activity.getWindow();
		window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
>>>>>>> 424faa4f080778205f883271b49f37b81f7000ad
	}

	@Override
Solution content 
		// Give the MessageCenterView a callback when a message is sent.
		MessageManager.setAfterSendMessageListener(messageCenterView);

		activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED |
				WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);

		messageCenterView.scrollMessageListViewToBottom();
	}

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