diff options
author | Winson <winsonc@google.com> | 2015-08-13 15:18:25 -0700 |
---|---|---|
committer | Winson <winsonc@google.com> | 2015-08-13 15:58:51 -0700 |
commit | 97b0d08d92c64034ba03ae8da5a8531edbd60d52 (patch) | |
tree | 3681551a6c638cc7707b5bfa0a9d9b0f65ea7a89 /src | |
parent | 81056da1def5d872d26b6f8a4e4163f9d94871a3 (diff) | |
download | android_packages_apps_Trebuchet-97b0d08d92c64034ba03ae8da5a8531edbd60d52.tar.gz android_packages_apps_Trebuchet-97b0d08d92c64034ba03ae8da5a8531edbd60d52.tar.bz2 android_packages_apps_Trebuchet-97b0d08d92c64034ba03ae8da5a8531edbd60d52.zip |
Refactoring to ExtendedEditText.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/ExtendedEditText.java (renamed from src/com/android/launcher3/allapps/AllAppsSearchEditView.java) | 20 | ||||
-rw-r--r-- | src/com/android/launcher3/Folder.java | 13 | ||||
-rw-r--r-- | src/com/android/launcher3/FolderEditText.java | 36 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/DefaultAppSearchController.java | 12 |
4 files changed, 28 insertions, 53 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsSearchEditView.java b/src/com/android/launcher3/ExtendedEditText.java index b7dcd66ed..c7b64ec7d 100644 --- a/src/com/android/launcher3/allapps/AllAppsSearchEditView.java +++ b/src/com/android/launcher3/ExtendedEditText.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.allapps; +package com.android.launcher3; import android.content.Context; import android.util.AttributeSet; @@ -22,28 +22,28 @@ import android.widget.EditText; /** - * The edit text for the search container + * The edit text that reports back when the back key has been pressed. */ -public class AllAppsSearchEditView extends EditText { +public class ExtendedEditText extends EditText { /** * Implemented by listeners of the back key. */ public interface OnBackKeyListener { - public void onBackKey(); + public boolean onBackKey(); } private OnBackKeyListener mBackKeyListener; - public AllAppsSearchEditView(Context context) { - this(context, null); + public ExtendedEditText(Context context) { + super(context); } - public AllAppsSearchEditView(Context context, AttributeSet attrs) { - this(context, attrs, 0); + public ExtendedEditText(Context context, AttributeSet attrs) { + super(context, attrs); } - public AllAppsSearchEditView(Context context, AttributeSet attrs, int defStyleAttr) { + public ExtendedEditText(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } @@ -56,7 +56,7 @@ public class AllAppsSearchEditView extends EditText { // If this is a back key, propagate the key back to the listener if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) { if (mBackKeyListener != null) { - mBackKeyListener.onBackKey(); + return mBackKeyListener.onBackKey(); } return false; } diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 5e713b21f..7b88a8865 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -124,7 +124,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList @Thunk FolderPagedView mContent; @Thunk View mContentWrapper; - FolderEditText mFolderName; + ExtendedEditText mFolderName; private View mFooter; private int mFooterHeight; @@ -196,8 +196,15 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mContent = (FolderPagedView) findViewById(R.id.folder_content); mContent.setFolder(this); - mFolderName = (FolderEditText) findViewById(R.id.folder_name); - mFolderName.setFolder(this); + mFolderName = (ExtendedEditText) findViewById(R.id.folder_name); + mFolderName.setOnBackKeyListener(new ExtendedEditText.OnBackKeyListener() { + @Override + public boolean onBackKey() { + // Close the activity on back key press + doneEditingFolderName(true); + return false; + } + }); mFolderName.setOnFocusChangeListener(this); // We disable action mode for now since it messes up the view on phones diff --git a/src/com/android/launcher3/FolderEditText.java b/src/com/android/launcher3/FolderEditText.java deleted file mode 100644 index c31100899..000000000 --- a/src/com/android/launcher3/FolderEditText.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.android.launcher3; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.KeyEvent; -import android.widget.EditText; - -public class FolderEditText extends EditText { - - private Folder mFolder; - - public FolderEditText(Context context) { - super(context); - } - - public FolderEditText(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public FolderEditText(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - } - - public void setFolder(Folder folder) { - mFolder = folder; - } - - @Override - public boolean onKeyPreIme(int keyCode, KeyEvent event) { - // Catch the back button on the soft keyboard so that we can just close the activity - if (event.getKeyCode() == android.view.KeyEvent.KEYCODE_BACK) { - mFolder.doneEditingFolderName(true); - } - return super.onKeyPreIme(keyCode, event); - } -} diff --git a/src/com/android/launcher3/allapps/DefaultAppSearchController.java b/src/com/android/launcher3/allapps/DefaultAppSearchController.java index e1a2b7fda..3169f842a 100644 --- a/src/com/android/launcher3/allapps/DefaultAppSearchController.java +++ b/src/com/android/launcher3/allapps/DefaultAppSearchController.java @@ -25,6 +25,7 @@ import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.TextView; +import com.android.launcher3.ExtendedEditText; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.util.Thunk; @@ -54,7 +55,8 @@ final class DefaultAppSearchController extends AllAppsSearchBarController @Thunk View mSearchBarContainerView; private View mSearchButtonView; private View mDismissSearchButtonView; - @Thunk AllAppsSearchEditView mSearchBarEditView; + @Thunk + ExtendedEditText mSearchBarEditView; @Thunk AllAppsRecyclerView mAppsRecyclerView; @Thunk Runnable mFocusRecyclerViewRunnable = new Runnable() { @Override @@ -82,21 +84,23 @@ final class DefaultAppSearchController extends AllAppsSearchBarController mSearchBarContainerView = mSearchView.findViewById(R.id.search_container); mDismissSearchButtonView = mSearchBarContainerView.findViewById(R.id.dismiss_search_button); mDismissSearchButtonView.setOnClickListener(this); - mSearchBarEditView = (AllAppsSearchEditView) + mSearchBarEditView = (ExtendedEditText) mSearchBarContainerView.findViewById(R.id.search_box_input); mSearchBarEditView.addTextChangedListener(this); mSearchBarEditView.setOnEditorActionListener(this); mSearchBarEditView.setOnBackKeyListener( - new AllAppsSearchEditView.OnBackKeyListener() { + new ExtendedEditText.OnBackKeyListener() { @Override - public void onBackKey() { + public boolean onBackKey() { // Only hide the search field if there is no query, or if there // are no filtered results String query = Utilities.trim( mSearchBarEditView.getEditableText().toString()); if (query.isEmpty() || mApps.hasNoFilteredResults()) { hideSearchField(true, mFocusRecyclerViewRunnable); + return true; } + return false; } }); return mSearchView; |