Snap for 6553159 from d4a805c41648d6d60df2c56eba1171c25e9143b1 to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-release

Change-Id: Iec14b53567e3984e39d1610ac964025965167be5

2 files changed, 23 insertions, 9 deletions

diff --git a/main/src/com/google/android/setupdesign/template/ListMixin.java b/main/src/com/google/android/setupdesign/template/ListMixin.java
index 6e2cb20..38928aa 100644
--- a/main/src/com/google/android/setupdesign/template/ListMixin.java
+++ b/main/src/com/google/android/setupdesign/template/ListMixin.java
@@ -187,15 +187,17 @@ public class ListMixin implements Mixin {
       if (defaultDivider == null) {
         defaultDivider = listView.getDivider();
       }
-      divider =
-          DrawableLayoutDirectionHelper.createRelativeInsetDrawable(
-              defaultDivider,
-              dividerInsetStart /* start */,
-              0 /* top */,
-              dividerInsetEnd /* end */,
-              0 /* bottom */,
-              templateLayout);
-      listView.setDivider(divider);
+      if (defaultDivider != null) {
+        divider =
+            DrawableLayoutDirectionHelper.createRelativeInsetDrawable(
+                defaultDivider,
+                dividerInsetStart /* start */,
+                0 /* top */,
+                dividerInsetEnd /* end */,
+                0 /* bottom */,
+                templateLayout);
+        listView.setDivider(divider);
+      }
     }
   }
 
diff --git a/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java b/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java
index 0654b02..2e4fd71 100644
--- a/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java
+++ b/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java
@@ -368,6 +368,18 @@ public class IllustrationVideoView extends TextureView
     return false;
   }
 
+  /**
+   * Seeks to specified time position.
+   *
+   * @param milliseconds the offset in milliseconds from the start to seek to
+   * @throws IllegalStateException if the internal player engine has not been initialized
+   */
+  public void seekTo(int milliseconds) {
+    if (mediaPlayer != null) {
+      mediaPlayer.seekTo(milliseconds);
+    }
+  }
+
   @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
   public MediaPlayer getMediaPlayer() {
     return mediaPlayer;