diff options
7 files changed, 82 insertions, 15 deletions
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index 5f55bdc0e0d3..04fa637b72f2 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -224,6 +224,14 @@ public final class MotionEvent extends InputEvent implements Parcelable { * Constant for {@link #getActionMasked}: A movement has happened outside of the * normal bounds of the UI element. This does not provide a full gesture, * but only the initial location of the movement/touch. + * <p> + * Note: Because the location of any event will be outside the + * bounds of the view hierarchy, it will not get dispatched to + * any children of a ViewGroup by default. Therefore, + * movements with ACTION_OUTSIDE should be handled in either the + * root {@link View} or in the appropriate {@link Window.Callback} + * (e.g. {@link android.app.Activity} or {@link android.app.Dialog}). + * </p> */ public static final int ACTION_OUTSIDE = 4; diff --git a/packages/SystemUI/res/layout/navigation_bar_window.xml b/packages/SystemUI/res/layout/navigation_bar_window.xml index 051bf3ac3faf..6fa46d4ba3f8 100644 --- a/packages/SystemUI/res/layout/navigation_bar_window.xml +++ b/packages/SystemUI/res/layout/navigation_bar_window.xml @@ -16,11 +16,11 @@ ** limitations under the License. */ --> -<FrameLayout +<com.android.systemui.statusbar.phone.NavigationBarFrame xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res-auto" android:id="@+id/navigation_bar_frame" android:layout_height="match_parent" android:layout_width="match_parent"> -</FrameLayout> +</com.android.systemui.statusbar.phone.NavigationBarFrame> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFrame.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFrame.java new file mode 100644 index 000000000000..741f7839f455 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFrame.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.systemui.statusbar.phone; + +import static android.view.MotionEvent.ACTION_OUTSIDE; + +import android.annotation.AttrRes; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.widget.FrameLayout; + +import com.android.systemui.statusbar.policy.DeadZone; + +public class NavigationBarFrame extends FrameLayout { + + private DeadZone mDeadZone = null; + + public NavigationBarFrame(@NonNull Context context) { + super(context); + } + + public NavigationBarFrame(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public NavigationBarFrame(@NonNull Context context, @Nullable AttributeSet attrs, + @AttrRes int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public void setDeadZone(@NonNull DeadZone deadZone) { + mDeadZone = deadZone; + } + + @Override + public boolean dispatchTouchEvent(MotionEvent event) { + if (event.getAction() == ACTION_OUTSIDE) { + if (mDeadZone != null) { + return mDeadZone.onTouchEvent(event); + } + } + return super.dispatchTouchEvent(event); + } +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index cb3222d6d287..a6cd472f2686 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -249,9 +249,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav if (mGestureHelper.onTouchEvent(event)) { return true; } - if (mDeadZone != null && event.getAction() == MotionEvent.ACTION_OUTSIDE) { - mDeadZone.poke(event); - } return super.onTouchEvent(event); } @@ -612,9 +609,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav public void reorient() { updateCurrentView(); - getImeSwitchButton().setOnClickListener(mImeSwitcherClickListener); - mDeadZone = (DeadZone) mCurrentView.findViewById(R.id.deadzone); + ((NavigationBarFrame) getRootView()).setDeadZone(mDeadZone); mDeadZone.setDisplayRotation(mCurrentRotation); // force the low profile & disabled states into compliance diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java index 4c879c68f2ff..13ee23fb7af9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java @@ -127,6 +127,7 @@ public class DeadZone extends View { final int action = event.getAction(); if (action == MotionEvent.ACTION_OUTSIDE) { poke(event); + return true; } else if (action == MotionEvent.ACTION_DOWN) { if (DEBUG) { Slog.v(TAG, this + " ACTION_DOWN: " + event.getX() + "," + event.getY()); @@ -158,7 +159,7 @@ public class DeadZone extends View { return false; } - public void poke(MotionEvent event) { + private void poke(MotionEvent event) { mLastPokeTime = event.getEventTime(); if (DEBUG) Slog.v(TAG, "poked! size=" + getSize(mLastPokeTime)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java index a120cecb55e8..4cc83f632426 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java @@ -14,7 +14,6 @@ package com.android.systemui.statusbar.phone; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -33,17 +32,13 @@ import com.android.systemui.recents.Recents; import com.android.systemui.stackdivider.Divider; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper; -import com.android.systemui.utils.leaks.BaseLeakChecker; import android.testing.TestableLooper.RunWithLooper; -import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; @RunWith(AndroidTestingRunner.class) @RunWithLooper(setAsMainLooper = true) @@ -54,6 +49,10 @@ public class NavigationBarFragmentTest extends SysuiBaseFragmentTest { super(NavigationBarFragment.class); } + protected void createRootView() { + mView = new NavigationBarFrame(mContext); + } + @Before public void setup() { mDependency.injectTestDependency(Dependency.BG_LOOPER, Looper.getMainLooper()); diff --git a/tests/testables/src/android/testing/BaseFragmentTest.java b/tests/testables/src/android/testing/BaseFragmentTest.java index 5cedbdffed35..5fa065a9135a 100644 --- a/tests/testables/src/android/testing/BaseFragmentTest.java +++ b/tests/testables/src/android/testing/BaseFragmentTest.java @@ -50,7 +50,7 @@ public abstract class BaseFragmentTest { private static final int VIEW_ID = 42; private final Class<? extends Fragment> mCls; private Handler mHandler; - private FrameLayout mView; + protected FrameLayout mView; protected FragmentController mFragments; protected Fragment mFragment; @@ -61,9 +61,13 @@ public abstract class BaseFragmentTest { mCls = cls; } + protected void createRootView() { + mView = new FrameLayout(mContext); + } + @Before public void setupFragment() throws Exception { - mView = new FrameLayout(mContext); + createRootView(); mView.setId(VIEW_ID); assertNotNull("BaseFragmentTest must be tagged with @RunWithLooper", |