diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-09 16:15:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-09 16:15:31 +0000 |
| commit | b615fa46c95ff30ff22764c1bb49b5652bdcd84a (patch) | |
| tree | afb952aeca507ad572b6583af12ca7bad7ed6a62 /core/java/android/app/ProgressDialog.java | |
| parent | 62e56d9b3696227f8ecd1361da8ba2c36f965bc7 (diff) | |
| parent | fe3063fb7176f0734edd610ed76aa5b1921ac3a9 (diff) | |
Merge "Use new UnsupportedAppUsage annotation." am: 70129fc863 am: fe3063fb71
Change-Id: Iea82f97f0ba766ce3f435630175aea48ca47f12f
Diffstat (limited to 'core/java/android/app/ProgressDialog.java')
| -rw-r--r-- | core/java/android/app/ProgressDialog.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/ProgressDialog.java b/core/java/android/app/ProgressDialog.java index 3193eb89ac80..432fae5e9033 100644 --- a/core/java/android/app/ProgressDialog.java +++ b/core/java/android/app/ProgressDialog.java @@ -16,9 +16,7 @@ package android.app; -import com.android.internal.R; - -import android.annotation.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; @@ -34,6 +32,8 @@ import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; +import com.android.internal.R; + import java.text.NumberFormat; /** |