Merge "Make widget sheet layout container not focusable" into main (49e27e52) · Commits · e / os / BlissLauncher3

res/layout/widgets_full_sheet.xml

+2 −4

Original line number	Diff line number	Diff line
		@@ -24,9 +24,7 @@
		<com.android.launcher3.views.SpringRelativeLayout
		android:id="@+id/container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:focusable="true"
		android:importantForAccessibility="no">
		android:layout_height="match_parent">

		<View
		android:id="@+id/collapse_handle"

+1 −3

Original line number	Diff line number	Diff line
		@@ -23,9 +23,7 @@
		<com.android.launcher3.views.SpringRelativeLayout
		android:id="@+id/container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:focusable="true"
		android:importantForAccessibility="no">
		android:layout_height="match_parent">

		<View
		android:id="@+id/collapse_handle"

+1 −9

Original line number	Diff line number	Diff line
		@@ -37,8 +37,7 @@ import java.util.ArrayList;
		* Controller for a search bar with an edit text and a cancel button.
		*/
		public class WidgetsSearchBarController implements TextWatcher,
		SearchCallback<WidgetsListBaseEntry>, ExtendedEditText.OnBackKeyListener,
		View.OnKeyListener {
		SearchCallback<WidgetsListBaseEntry>, View.OnKeyListener {
		private static final String TAG = "WidgetsSearchBarController";
		private static final boolean DEBUG = false;

		@@ -54,7 +53,6 @@ public class WidgetsSearchBarController implements TextWatcher,
		mSearchAlgorithm = algo;
		mInput = editText;
		mInput.addTextChangedListener(this);
		mInput.setOnBackKeyListener(this);
		mInput.setOnKeyListener(this);
		mCancelButton = cancelButton;
		mCancelButton.setOnClickListener(v -> clearSearchResult());
		@@ -107,12 +105,6 @@ public class WidgetsSearchBarController implements TextWatcher,
		mSearchAlgorithm.destroy();
		}

		@Override
		public boolean onBackKey() {
		clearFocus();
		return true;
		}

		@Override
		public boolean onKey(View view, int keyCode, KeyEvent event) {
		if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {