Arrange cards based on default matrix

Previously we were arranging cards on the screen using the
individual card's matrix. When the card matrices are
different, however, this leads to an inconsistent layout.
Instead, use the default card matrix for layout, while
using the individaul card matrix (which, when not set
separately, is the same as the default card matrix) for
handling drawing the individual card.

Bug: 3365044
Change-Id: Ibb7ad7760131d2c649cc0882b784c9d2e73a737f

1 files changed, 1 insertions, 1 deletions

diff --git a/carousel/java/com/android/ex/carousel/carousel.rs b/carousel/java/com/android/ex/carousel/carousel.rs
index efccbd0..7468c6f 100644
--- a/carousel/java/com/android/ex/carousel/carousel.rs
+++ b/carousel/java/com/android/ex/carousel/carousel.rs
@@ -582,7 +582,7 @@ static float getVerticalOffsetForCard(int i) {
        return 0;
    }
    const float cardHeight = (cardVertices[3].y - cardVertices[0].y) *
-      rsMatrixGet(&cards[i].matrix, 1, 1);
+      rsMatrixGet(&defaultCardMatrix, 1, 1);
    const float totalHeight = rowCount * (cardHeight + rowSpacing) - rowSpacing;
    if (firstCardTop)
       i = rowCount - (i % rowCount) - 1;