Merge "Resolve auto close on widget swipe" (8bc27305) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/allapps/AlphabeticalAppsList.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ public class AlphabeticalAppsList implements AllAppsStore.OnUpdateListener {
		* Returns the child adapter item with IME launch focus.
		*/
		public AdapterItem getFocusedChild() {
		if (mAdapterItems.size() == 0 \|\| getFocusedChildIndex() != -1) {
		if (mAdapterItems.size() == 0 \|\| getFocusedChildIndex() == -1) {
		return null;
		}
		return mAdapterItems.get(getFocusedChildIndex());

+6 −4

Original line number	Diff line number	Diff line
		@@ -150,12 +150,14 @@ public class SearchResultWidget extends RelativeLayout implements
		public boolean onInterceptTouchEvent(MotionEvent ev) {
		mLongPressHelper.onTouchEvent(ev);
		mClickDetector.onTouchEvent(ev);
		if (ev.getAction() == MotionEvent.ACTION_UP && !mLongPressHelper.hasPerformedLongPress()) {
		handleSelection(SearchTargetEvent.CHILD_SELECT);
		}
		return super.onInterceptTouchEvent(ev);
		return mLongPressHelper.hasPerformedLongPress();
		}

		@Override
		public boolean onTouchEvent(MotionEvent ev) {
		mLongPressHelper.onTouchEvent(ev);
		return true;
		}

		@Override
		public void cancelLongPress() {