diff options
Diffstat (limited to 'tools/layoutlib/bridge/src/android/text')
6 files changed, 6 insertions, 8 deletions
diff --git a/tools/layoutlib/bridge/src/android/text/GreedyLineBreaker.java b/tools/layoutlib/bridge/src/android/text/GreedyLineBreaker.java index b95cda6..50289e9 100644 --- a/tools/layoutlib/bridge/src/android/text/GreedyLineBreaker.java +++ b/tools/layoutlib/bridge/src/android/text/GreedyLineBreaker.java @@ -16,8 +16,7 @@ package android.text; -import com.android.annotations.NonNull; - +import android.annotation.NonNull; import android.text.Primitive.PrimitiveType; import android.text.StaticLayout.LineBreaks; diff --git a/tools/layoutlib/bridge/src/android/text/LineBreaker.java b/tools/layoutlib/bridge/src/android/text/LineBreaker.java index edeef78..06e9c84 100644 --- a/tools/layoutlib/bridge/src/android/text/LineBreaker.java +++ b/tools/layoutlib/bridge/src/android/text/LineBreaker.java @@ -16,8 +16,8 @@ package android.text; +import android.annotation.NonNull; import android.text.StaticLayout.LineBreaks; -import com.android.annotations.NonNull; import java.util.Collections; import java.util.List; diff --git a/tools/layoutlib/bridge/src/android/text/OptimizingLineBreaker.java b/tools/layoutlib/bridge/src/android/text/OptimizingLineBreaker.java index cd92581..ed8e33a 100644 --- a/tools/layoutlib/bridge/src/android/text/OptimizingLineBreaker.java +++ b/tools/layoutlib/bridge/src/android/text/OptimizingLineBreaker.java @@ -16,8 +16,7 @@ package android.text; -import com.android.annotations.NonNull; - +import android.annotation.NonNull; import android.text.Primitive.PrimitiveType; import android.text.StaticLayout.LineBreaks; diff --git a/tools/layoutlib/bridge/src/android/text/Primitive.java b/tools/layoutlib/bridge/src/android/text/Primitive.java index ce77601..37ed072 100644 --- a/tools/layoutlib/bridge/src/android/text/Primitive.java +++ b/tools/layoutlib/bridge/src/android/text/Primitive.java @@ -16,7 +16,7 @@ package android.text; -import com.android.annotations.NonNull; +import android.annotation.NonNull; // Based on the native implementation of Primitive in // frameworks/base/core/jni/android_text_StaticLayout.cpp revision b808260 diff --git a/tools/layoutlib/bridge/src/android/text/StaticLayout_Delegate.java b/tools/layoutlib/bridge/src/android/text/StaticLayout_Delegate.java index 4226526..1b0ba51 100644 --- a/tools/layoutlib/bridge/src/android/text/StaticLayout_Delegate.java +++ b/tools/layoutlib/bridge/src/android/text/StaticLayout_Delegate.java @@ -1,9 +1,9 @@ package android.text; -import com.android.annotations.NonNull; import com.android.layoutlib.bridge.impl.DelegateManager; import com.android.tools.layoutlib.annotations.LayoutlibDelegate; +import android.annotation.NonNull; import android.graphics.BidiRenderer; import android.graphics.Paint; import android.graphics.Paint_Delegate; diff --git a/tools/layoutlib/bridge/src/android/text/TabStops.java b/tools/layoutlib/bridge/src/android/text/TabStops.java index cff6b93..6c2f1e1 100644 --- a/tools/layoutlib/bridge/src/android/text/TabStops.java +++ b/tools/layoutlib/bridge/src/android/text/TabStops.java @@ -16,7 +16,7 @@ package android.text; -import com.android.annotations.Nullable; +import android.annotation.Nullable; // Based on the native implementation of TabStops in // frameworks/base/core/jni/android_text_StaticLayout.cpp revision b808260 |