Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '242b9c4eee9d42d02fd2259ffe2124234653aaf2':
  Fix row/column order when unparcelling CollectionItemInfo
This commit is contained in:
Alan Viverette
2015-06-01 16:44:03 +00:00
committed by Android Git Automerger
parent 378c2cbf2e 242b9c4eee
commit 508b6d2d57
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/accessibility/AccessibilityNodeInfo.java
View File

@@ -2737,10 +2737,10 @@ public class AccessibilityNodeInfo implements Parcelable {
if (mCollectionItemInfo != null) { if (mCollectionItemInfo != null) {
parcel.writeInt(1); parcel.writeInt(1);
parcel.writeInt(mCollectionItemInfo.getColumnIndex());
parcel.writeInt(mCollectionItemInfo.getColumnSpan());
parcel.writeInt(mCollectionItemInfo.getRowIndex()); parcel.writeInt(mCollectionItemInfo.getRowIndex());
parcel.writeInt(mCollectionItemInfo.getRowSpan()); parcel.writeInt(mCollectionItemInfo.getRowSpan());
parcel.writeInt(mCollectionItemInfo.getColumnIndex());
parcel.writeInt(mCollectionItemInfo.getColumnSpan());
parcel.writeInt(mCollectionItemInfo.isHeading() ? 1 : 0); parcel.writeInt(mCollectionItemInfo.isHeading() ? 1 : 0);
parcel.writeInt(mCollectionItemInfo.isSelected() ? 1 : 0); parcel.writeInt(mCollectionItemInfo.isSelected() ? 1 : 0);
} else { } else {