diff options
| author | Scott Main <smain@google.com> | 2013-06-17 18:41:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-17 18:41:29 -0700 |
| commit | f78484b0b130472a5a73c2bab91f0475508aa018 (patch) | |
| tree | 1df9c7fa04fa4c5d084860dfa3a1199bcd74ff64 | |
| parent | 3b7e6b95c251cb42d0e0bdc8876c35b3f1582aca (diff) | |
| parent | ea8935362da192508a4ff945b47e0c7ff1239679 (diff) | |
| download | frameworks_base-f78484b0b130472a5a73c2bab91f0475508aa018.zip frameworks_base-f78484b0b130472a5a73c2bab91f0475508aa018.tar.gz frameworks_base-f78484b0b130472a5a73c2bab91f0475508aa018.tar.bz2 | |
am ea893536: am c4473d10: am 27a8508e: add attributes reference for splimotionevents and layoutmode
* commit 'ea8935362da192508a4ff945b47e0c7ff1239679':
add attributes reference for splimotionevents and layoutmode
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index fd9e6e4..d3f9174 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -97,6 +97,8 @@ import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1; * @attr ref android.R.styleable#ViewGroup_addStatesFromChildren * @attr ref android.R.styleable#ViewGroup_descendantFocusability * @attr ref android.R.styleable#ViewGroup_animateLayoutChanges + * @attr ref android.R.styleable#ViewGroup_splitMotionEvents + * @attr ref android.R.styleable#ViewGroup_layoutMode */ public abstract class ViewGroup extends View implements ViewParent, ViewManager { private static final String TAG = "ViewGroup"; @@ -2256,6 +2258,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @param split <code>true</code> to allow MotionEvents to be split and dispatched to multiple * child views. <code>false</code> to only allow one child view to be the target of * any MotionEvent received by this ViewGroup. + * @attr ref android.R.styleable#ViewGroup_splitMotionEvents */ public void setMotionEventSplittingEnabled(boolean split) { // TODO Applications really shouldn't change this setting mid-touch event, @@ -4905,6 +4908,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @param layoutMode the layout mode to use during layout operations * * @see #getLayoutMode() + * @attr ref android.R.styleable#ViewGroup_layoutMode */ public void setLayoutMode(int layoutMode) { if (mLayoutMode != layoutMode) { |