diff options
| author | Alan Viverette <alanv@google.com> | 2015-01-27 15:23:09 -0800 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2015-01-27 15:23:09 -0800 |
| commit | d8111138abbffa452a34fb97eb94b1c0e3b3b4f7 (patch) | |
| tree | 8a78ac9ff282983aeaf6e78df87324de6a3eaebb /core/java/com | |
| parent | 783f28691e27b7b116730fad4f9fd9c083bab283 (diff) | |
| parent | e5743753eee8da6019594a95d2c27881599a0582 (diff) | |
| download | frameworks_base-d8111138abbffa452a34fb97eb94b1c0e3b3b4f7.zip frameworks_base-d8111138abbffa452a34fb97eb94b1c0e3b3b4f7.tar.gz frameworks_base-d8111138abbffa452a34fb97eb94b1c0e3b3b4f7.tar.bz2 | |
resolve merge conflicts of e5743753 to master.
Change-Id: I83f4b6abb669963b9c4fcdf9870317e019360d46
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarContainer.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarContainer.java b/core/java/com/android/internal/widget/ActionBarContainer.java index e8e2c8d..7937a95 100644 --- a/core/java/com/android/internal/widget/ActionBarContainer.java +++ b/core/java/com/android/internal/widget/ActionBarContainer.java @@ -227,18 +227,6 @@ public class ActionBarContainer extends FrameLayout { return true; } - /** - * @hide - */ - @Override - public void addClickableRectsForAccessibility(List<RectF> outRects) { - // This class always consumes touch events, therefore if it - // covers a view we do not want to send a click over it. - RectF bounds = new RectF(); - bounds.set(0, 0, getWidth(), getHeight()); - outRects.add(bounds); - } - @Override public boolean onHoverEvent(MotionEvent ev) { super.onHoverEvent(ev); |