diff options
| author | Scott Main <smain@google.com> | 2013-06-17 18:36:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-17 18:36:09 -0700 |
| commit | c4473d10ed747fb1e84efff7183023e0ecc1a493 (patch) | |
| tree | 5f4b2e1ea8b42c2358f6372b317d7962d14c2842 | |
| parent | e4f975a3212d5cf4ba3a94d047674aebbc5285d1 (diff) | |
| parent | 27a8508ee1236ded652cd452b93884a9193654fc (diff) | |
| download | frameworks_base-c4473d10ed747fb1e84efff7183023e0ecc1a493.zip frameworks_base-c4473d10ed747fb1e84efff7183023e0ecc1a493.tar.gz frameworks_base-c4473d10ed747fb1e84efff7183023e0ecc1a493.tar.bz2 | |
am 27a8508e: add attributes reference for splimotionevents and layoutmode
* commit '27a8508ee1236ded652cd452b93884a9193654fc':
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 382710d..95d65eb 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"; @@ -2249,6 +2251,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, @@ -4816,6 +4819,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) { |