diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/ExtendedEditText.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/com/android/launcher3/ExtendedEditText.java b/src/com/android/launcher3/ExtendedEditText.java index f7737f423..c06f727a5 100644 --- a/src/com/android/launcher3/ExtendedEditText.java +++ b/src/com/android/launcher3/ExtendedEditText.java @@ -40,11 +40,13 @@ public class ExtendedEditText extends EditText { private OnBackKeyListener mBackKeyListener; public ExtendedEditText(Context context) { - this(context, null, 0); + // ctor chaining breaks the touch handling + super(context); } public ExtendedEditText(Context context, AttributeSet attrs) { - this(context, attrs, 0); + // ctor chaining breaks the touch handling + super(context, attrs); } public ExtendedEditText(Context context, AttributeSet attrs, int defStyleAttr) { @@ -95,6 +97,6 @@ public class ExtendedEditText extends EditText { private boolean showSoftInput() { return requestFocus() && ((InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE)) - .showSoftInput(this, InputMethodManager.SHOW_FORCED); + .showSoftInput(this, InputMethodManager.SHOW_IMPLICIT); } } diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 123c7d8bf..b6474e6ef 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3101,7 +3101,6 @@ public class Launcher extends Activity mWorkspace.startReordering(v); } else { showOverviewMode(true); - mHotseat.requestDisallowInterceptTouchEvent(true); } } else { final boolean isAllAppsButton = @@ -3229,6 +3228,9 @@ public class Launcher extends Activity mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(), Workspace.State.OVERVIEW, animated, postAnimRunnable); mState = State.WORKSPACE; + // If animated from long press, then don't allow any of the controller in the drag + // layer to intercept any remaining touch. + mWorkspace.requestDisallowInterceptTouchEvent(animated); } /** diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 9fcc6a40e..1719b0594 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -109,7 +109,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul public boolean onInterceptTouchEvent(MotionEvent ev) { if (ev.getAction() == MotionEvent.ACTION_DOWN) { mNoIntercept = false; - if (mLauncher.getWorkspace().isInOverviewMode() || mLauncher.isWidgetsViewVisible()) { + if (!mLauncher.isAllAppsVisible() && mLauncher.getWorkspace().workspaceInModalState()) { mNoIntercept = true; } else if (mLauncher.isAllAppsVisible() && !mAppsView.shouldContainerScroll(ev)) { @@ -160,9 +160,8 @@ public class AllAppsTransitionController implements TouchController, VerticalPul return true; } } else { - if ((mLauncher.getDragLayer().isEventOverHotseat(ev) - || mLauncher.getDragLayer().isEventOverPageIndicator(ev)) - && !grid.isVerticalBarLayout()) { + if (mLauncher.getDragLayer().isEventOverHotseat(ev) || + mLauncher.getDragLayer().isEventOverPageIndicator(ev)) { return true; } } |