Import updated Android Setupdesign Library 313865830 am: d4a805c416android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-release

Original change: undetermined

Change-Id: Id0bfae25853d780096aec1de46564c0b8d876650

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;