commit e738f6e409b0201e1fa7f66b9cd3da787a0041da
author Alan Viverette <alanv@google.com> Mon Apr 30 17:28:57 2018 -0400
committer Alan Viverette <alanv@google.com> Mon Apr 30 17:28:57 2018 -0400
tree fa02c7d7e833fb166df8c24212cd2a6e906d78fe
parent 1db799d32b8ba8b1b2decbd4f2ed1ef405cd583b

One last revert for DP2 compatibility

Bug: 78237249
Test: ./gradlew createArchive
Change-Id: I15883fa49ee1a71e4d3f3e352952bc455a3b5f29

slices/view/src/main/java/androidx/slice/widget/GridRowView.java

diff --git a/slices/view/src/main/java/androidx/slice/widget/GridRowView.java b/slices/view/src/main/java/androidx/slice/widget/GridRowView.java
index 9d06d85..2b1392a 100644
--- a/slices/view/src/main/java/androidx/slice/widget/GridRowView.java
+++ b/slices/view/src/main/java/androidx/slice/widget/GridRowView.java
@@ -386,7 +386,7 @@
         } else if (FORMAT_IMAGE.equals(prevItem.getFormat())) {
             return mTextPadding;
         } else if (FORMAT_TEXT.equals(prevItem.getFormat())
-                || FORMAT_LONG.equals(prevItem.getFormat())) {
+                || FORMAT_TIMESTAMP.equals(prevItem.getFormat())) {
             return mVerticalGridTextPadding;
         }
         return 0;

slices/view/src/main/java/androidx/slice/widget/RowContent.java

diff --git a/slices/view/src/main/java/androidx/slice/widget/RowContent.java b/slices/view/src/main/java/androidx/slice/widget/RowContent.java
index c865b02..3c0637e 100644
--- a/slices/view/src/main/java/androidx/slice/widget/RowContent.java
+++ b/slices/view/src/main/java/androidx/slice/widget/RowContent.java
@@ -186,7 +186,7 @@
             if ((FORMAT_ACTION.equals(format)
                     && SliceQuery.find(possibleStartItems.get(0), FORMAT_IMAGE) != null)
                     || FORMAT_SLICE.equals(format)
-                    || FORMAT_LONG.equals(format)
+                    || FORMAT_TIMESTAMP.equals(format)
                     || FORMAT_IMAGE.equals(format)) {
                 mStartItem = possibleStartItems.get(0);
             }