Resolve auto close on widget swipe

Bug: 172891360
Test: Manual
Change-Id: Icb384b6dc5ec9a29b6a9a7811b862a2d83ca11a7
(cherry picked from commit 5fa6f3ce503cde51687985ebc9dee6f163b9b1ea)
This commit is contained in:
Samuel Fufa
2020-11-11 09:48:24 -06:00
committed by Sunny Goyal
parent 54834b0909
commit 2c86122fa4
2 changed files with 7 additions and 5 deletions
@@ -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());
@@ -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() {