diff options
| author | Alan Viverette <alanv@google.com> | 2015-06-01 16:39:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 16:39:10 +0000 |
| commit | 242b9c4eee9d42d02fd2259ffe2124234653aaf2 (patch) | |
| tree | 933cc18831e803eff1d4b985c4f0521aa620a52c | |
| parent | e3e314df4d52881225326d426a76e3e7f1bc40d3 (diff) | |
| parent | faeac960cc4faa9ced011f67feb1327aafda44bf (diff) | |
| download | frameworks_base-242b9c4eee9d42d02fd2259ffe2124234653aaf2.zip frameworks_base-242b9c4eee9d42d02fd2259ffe2124234653aaf2.tar.gz frameworks_base-242b9c4eee9d42d02fd2259ffe2124234653aaf2.tar.bz2 | |
Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityNodeInfo.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 901a32d..b454d1c 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -2737,10 +2737,10 @@ public class AccessibilityNodeInfo implements Parcelable { if (mCollectionItemInfo != null) { parcel.writeInt(1); - parcel.writeInt(mCollectionItemInfo.getColumnIndex()); - parcel.writeInt(mCollectionItemInfo.getColumnSpan()); parcel.writeInt(mCollectionItemInfo.getRowIndex()); parcel.writeInt(mCollectionItemInfo.getRowSpan()); + parcel.writeInt(mCollectionItemInfo.getColumnIndex()); + parcel.writeInt(mCollectionItemInfo.getColumnSpan()); parcel.writeInt(mCollectionItemInfo.isHeading() ? 1 : 0); parcel.writeInt(mCollectionItemInfo.isSelected() ? 1 : 0); } else { |