diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-01-23 22:38:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-23 22:38:30 +0000 |
| commit | 166aa68630c04787caf88fc6b9e369efe7543fc6 (patch) | |
| tree | 2962f38cffdf905d8db978a5608eed919fe823ec /core/java/android | |
| parent | 50f316051a7d5f4d1b86267304a4d657fb175c3d (diff) | |
| parent | 9027d7355e8e804307902fb5ec88cf54e23cdcb4 (diff) | |
| download | frameworks_base-166aa68630c04787caf88fc6b9e369efe7543fc6.zip frameworks_base-166aa68630c04787caf88fc6b9e369efe7543fc6.tar.gz frameworks_base-166aa68630c04787caf88fc6b9e369efe7543fc6.tar.bz2 | |
am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev automerge: 6e9f276
automerge: 9027d73
* commit '9027d7355e8e804307902fb5ec88cf54e23cdcb4':
Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 4 | ||||
| -rw-r--r-- | core/java/android/widget/Toolbar.java | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index d03e098..ee9845f 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -831,8 +831,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // Clip the bounds by our bounds. bounds.left = Math.max(bounds.left, 0); bounds.top = Math.max(bounds.top, 0); - bounds.right = Math.min(bounds.right, mRight); - bounds.bottom = Math.min(bounds.bottom, mBottom); + bounds.right = Math.min(bounds.right, getWidth()); + bounds.bottom = Math.min(bounds.bottom, getHeight()); Iterator<View> iterator = obtainOrderedChildIterator(); while (iterator.hasNext()) { diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java index f90d64a..0f35e0d 100644 --- a/core/java/android/widget/Toolbar.java +++ b/core/java/android/widget/Toolbar.java @@ -21,6 +21,7 @@ import android.annotation.Nullable; import android.app.ActionBar; import android.content.Context; import android.content.res.TypedArray; +import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; @@ -1100,6 +1101,18 @@ public class Toolbar extends ViewGroup { * @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); + } + + /** + * @hide + */ + @Override protected void onSetLayoutParams(View child, ViewGroup.LayoutParams lp) { /* * Apps may set ActionBar.LayoutParams on their action bar custom views when |