Use a footer view for the folder namer.
Bug:3214584
Allows the EditText to be scrolled into view by
scrolling the list.
Change-Id: Idfb92d578f679b006bc2182c0c38143a12143eb0
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 262884b..e03c0f6 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -41,6 +41,7 @@
import android.preference.PreferenceManager;
import android.provider.BrowserContract;
import android.text.TextUtils;
+import android.util.AttributeSet;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -97,6 +98,8 @@
private View mDefaultView;
private View mFolderSelector;
private EditText mFolderNamer;
+ private boolean mIsFolderNamerShowing;
+ private View mFolderNamerHolder;
private View mAddNewFolder;
private View mAddSeparator;
private long mCurrentFolder = 0;
@@ -104,7 +107,7 @@
private BreadCrumbView mCrumbs;
private TextView mFakeTitle;
private View mCrumbHolder;
- private ListView mListView;
+ private CustomListView mListView;
private boolean mSaveToHomeScreen;
private long mRootFolder;
@@ -151,7 +154,7 @@
LOADER_ID_FOLDER_CONTENTS));
loader.setUri(getUriForFolder(folder));
loader.forceLoad();
- if (mFolderNamer.getVisibility() == View.VISIBLE) {
+ if (mIsFolderNamerShowing) {
completeOrCancelFolderNaming(true);
}
}
@@ -197,7 +200,7 @@
if (v == mButton) {
if (mFolderSelector.getVisibility() == View.VISIBLE) {
// We are showing the folder selector.
- if (mFolderNamer.getVisibility() == View.VISIBLE) {
+ if (mIsFolderNamerShowing) {
completeOrCancelFolderNaming(false);
} else {
// User has selected a folder. Go back to the opening page
@@ -208,7 +211,7 @@
finish();
}
} else if (v == mCancelButton) {
- if (mFolderNamer.getVisibility() == View.VISIBLE) {
+ if (mIsFolderNamerShowing) {
completeOrCancelFolderNaming(true);
} else if (mFolderSelector.getVisibility() == View.VISIBLE) {
switchToDefaultView(false);
@@ -225,14 +228,16 @@
popup.setOnMenuItemClickListener(this);
popup.show();
} else if (v == mAddNewFolder) {
- mFolderNamer.setVisibility(View.VISIBLE);
+ setShowFolderNamer(true);
mFolderNamer.setText(R.string.new_folder);
mFolderNamer.requestFocus();
- updateList();
mAddNewFolder.setVisibility(View.GONE);
mAddSeparator.setVisibility(View.GONE);
- getInputMethodManager().showSoftInput(mFolderNamer,
- InputMethodManager.SHOW_IMPLICIT);
+ InputMethodManager imm = getInputMethodManager();
+ // Set the InputMethodManager to focus on the ListView so that it
+ // can transfer the focus to mFolderNamer.
+ imm.focusIn(mListView);
+ imm.showSoftInput(mFolderNamer, InputMethodManager.SHOW_IMPLICIT);
}
}
@@ -258,27 +263,17 @@
return true;
}
- // Refresh the ListView to hide or show the empty view, as necessary.
- // Should be called after mFolderNamer is shown or hidden.
- private void updateList() {
- if (mAdapter.getCount() == 0) {
- // XXX: Is there a better way to refresh the ListView?
- mListView.setAdapter(mAdapter);
- }
- }
-
private void completeOrCancelFolderNaming(boolean cancel) {
if (!cancel && !TextUtils.isEmpty(mFolderNamer.getText())) {
String name = mFolderNamer.getText().toString();
long id = addFolderToCurrent(mFolderNamer.getText().toString());
descendInto(name, id);
}
- mFolderNamer.setVisibility(View.GONE);
+ setShowFolderNamer(false);
mAddNewFolder.setVisibility(View.VISIBLE);
mAddSeparator.setVisibility(View.VISIBLE);
getInputMethodManager().hideSoftInputFromWindow(
- mFolderNamer.getWindowToken(), 0);
- updateList();
+ mListView.getWindowToken(), 0);
}
private long addFolderToCurrent(String name) {
@@ -461,6 +456,24 @@
descendInto(tv.getText().toString(), id);
}
+ private void setShowFolderNamer(boolean show) {
+ if (show != mIsFolderNamerShowing) {
+ mIsFolderNamerShowing = show;
+ if (show) {
+ // Set the selection to the folder namer so it will be in
+ // view.
+ mListView.addFooterView(mFolderNamerHolder);
+ } else {
+ mListView.removeFooterView(mFolderNamerHolder);
+ }
+ // Refresh the list.
+ mListView.setAdapter(mAdapter);
+ if (show) {
+ mListView.setSelection(mListView.getCount() - 1);
+ }
+ }
+ }
+
/**
* Shows a list of names of folders.
*/
@@ -488,7 +501,7 @@
@Override
public boolean isEmpty() {
// Do not show the empty view if the user is creating a new folder.
- return super.isEmpty() && mFolderNamer.getVisibility() == View.GONE;
+ return super.isEmpty() && !mIsFolderNamerShowing;
}
}
@@ -554,7 +567,8 @@
mDefaultView = findViewById(R.id.default_view);
mFolderSelector = findViewById(R.id.folder_selector);
- mFolderNamer = (EditText) findViewById(R.id.folder_namer);
+ mFolderNamerHolder = getLayoutInflater().inflate(R.layout.new_folder_layout, null);
+ mFolderNamer = (EditText) mFolderNamerHolder.findViewById(R.id.folder_namer);
mFolderNamer.setOnEditorActionListener(this);
mAddNewFolder = findViewById(R.id.add_new_folder);
@@ -570,11 +584,12 @@
mCrumbs.setMaxVisible(MAX_CRUMBS_SHOWN);
mAdapter = new FolderAdapter(this);
- mListView = (ListView) findViewById(R.id.list);
+ mListView = (CustomListView) findViewById(R.id.list);
View empty = findViewById(R.id.empty);
mListView.setEmptyView(empty);
mListView.setAdapter(mAdapter);
mListView.setOnItemClickListener(this);
+ mListView.addEditText(mFolderNamer);
LoaderManager manager = getLoaderManager();
if (mCurrentFolder != mRootFolder) {
// Find all the folders
@@ -848,4 +863,32 @@
}
return true;
}
+
+ /*
+ * Class used as a proxy for the InputMethodManager to get to mFolderNamer
+ */
+ public static class CustomListView extends ListView {
+ private EditText mEditText;
+
+ public void addEditText(EditText editText) {
+ mEditText = editText;
+ }
+
+ public CustomListView(Context context) {
+ super(context);
+ }
+
+ public CustomListView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public CustomListView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+
+ @Override
+ public boolean checkInputConnectionProxy(View view) {
+ return view == mEditText;
+ }
+ }
}