Merge pull request #4797 from hieupham007/timob-13686-v4

timob-15506: fix editText layout issue for header/footerView

android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java

@@ -46,6 +46,7 @@
 import android.view.ViewParent;
 import android.widget.AbsListView;
 import android.widget.BaseAdapter;
+import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
@@ -112,9 +113,15 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 			}
 			OnFocusChangeListener focusListener = null;
 			View focusedView = listView.findFocus();
+			int cursorPosition = -1;
 			if (focusedView != null) {
 				OnFocusChangeListener listener = focusedView.getOnFocusChangeListener();
 				if (listener != null && listener instanceof TiUIView) {
+					//Before unfocus the current editText, store cursor position so
+					//we can restore it later
+					if (focusedView instanceof EditText) {
+						cursorPosition = ((EditText)focusedView).getSelectionStart();
+					}
 					focusedView.setOnFocusChangeListener(null);
 					focusListener = listener;
 				}
@@ -144,6 +151,10 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 					//Ok right now focus is with listView. So set it back to the focusedView
 					focusedView.requestFocus();
 					focusedView.setOnFocusChangeListener(focusListener);
+					//Restore cursor position
+					if (cursorPosition != -1) {
+						((EditText)focusedView).setSelection(cursorPosition);
+					}
 				}
 			}
 		}