From e6ebd8d70ae0ff9fd69792fec3523a88e6f5c8b5 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Mon, 17 Feb 2020 13:57:17 +0000
Subject: [PATCH] Move SpanUtil into text.span package

Seems like it belongs here.

PiperOrigin-RevId: 295571820
---
 .../com/google/android/exoplayer2/text/{ => span}/SpanUtil.java | 2 +-
 .../com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java | 2 +-
 .../google/android/exoplayer2/text/webvtt/WebvttCueParser.java  | 2 +-
 .../google/android/exoplayer2/text/{ => span}/SpanUtilTest.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename library/core/src/main/java/com/google/android/exoplayer2/text/{ => span}/SpanUtil.java (97%)
 rename library/core/src/test/java/com/google/android/exoplayer2/text/{ => span}/SpanUtilTest.java (98%)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SpanUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java
similarity index 97%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SpanUtil.java
rename to library/core/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java
index 9e9f350dd7..d215f368a4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/SpanUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.text;
+package com.google.android.exoplayer2.text.span;
 
 import android.text.Spannable;
 import android.text.style.ForegroundColorSpan;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java
index 95bba58510..f209936b39 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java
@@ -28,8 +28,8 @@ import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.text.style.UnderlineSpan;
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.text.SpanUtil;
 import com.google.android.exoplayer2.text.span.HorizontalTextInVerticalContextSpan;
+import com.google.android.exoplayer2.text.span.SpanUtil;
 import java.util.Map;
 
 /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
index c57d9d2164..10da625ca6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.exoplayer2.text.webvtt;
 
-import static com.google.android.exoplayer2.text.SpanUtil.addOrReplaceSpan;
+import static com.google.android.exoplayer2.text.span.SpanUtil.addOrReplaceSpan;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import android.graphics.Color;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/SpanUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java
similarity index 98%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/SpanUtilTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java
index 3a71925255..cdccf045a5 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/SpanUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.text;
+package com.google.android.exoplayer2.text.span;
 
 import static com.google.common.truth.Truth.assertThat;