am 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev

* commit '508b6d2d576b1bdd528362fbb069961a9a65c2fb':
  Fix row/column order when unparcelling CollectionItemInfo
This commit is contained in:
Alan Viverette
2015-06-01 18:50:46 +00:00
committed by Android Git Automerger

View File

@@ -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 {