diff options
Diffstat (limited to 'src')
19 files changed, 29 insertions, 29 deletions
diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java index 9af1fb8ba..929155656 100644 --- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java +++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java @@ -32,7 +32,7 @@ import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; import android.os.IBinder; -import android.support.v4.print.PrintHelper; +import androidx.print.PrintHelper; import android.view.Menu; import android.view.MenuItem; import android.view.Window; diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index e627a612b..d0bc29ad0 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -42,11 +42,11 @@ import android.os.Bundle; import android.os.CancellationSignal; import android.os.Handler; import android.os.IBinder; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.print.PrintHelper; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentTransaction; +import androidx.print.PrintHelper; import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; diff --git a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java index fb51bf5ad..c7aadfaf1 100644 --- a/src/com/android/gallery3d/filtershow/category/CategoryPanel.java +++ b/src/com/android/gallery3d/filtershow/category/CategoryPanel.java @@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.category; import android.app.Activity; import android.graphics.Rect; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java index 082bf143a..75574c306 100644 --- a/src/com/android/gallery3d/filtershow/category/MainPanel.java +++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java @@ -17,8 +17,8 @@ package com.android.gallery3d.filtershow.category; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java index a60b6722c..51e01d03a 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java @@ -18,8 +18,8 @@ package com.android.gallery3d.filtershow.editors; import android.app.Activity; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java index 2022ffd7e..e2f21f326 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java @@ -32,7 +32,7 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Shader; import android.graphics.drawable.NinePatchDrawable; -import android.support.v4.widget.EdgeEffectCompat; +import androidx.core.widget.EdgeEffectCompat; import android.util.AttributeSet; import android.util.Log; import android.view.GestureDetector; diff --git a/src/com/android/gallery3d/filtershow/info/InfoPanel.java b/src/com/android/gallery3d/filtershow/info/InfoPanel.java index 3a6657849..1d8751de9 100644 --- a/src/com/android/gallery3d/filtershow/info/InfoPanel.java +++ b/src/com/android/gallery3d/filtershow/info/InfoPanel.java @@ -20,7 +20,7 @@ import android.graphics.Bitmap; import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java b/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java index 63a6165e3..81de6cf7b 100644 --- a/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java +++ b/src/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java @@ -17,7 +17,7 @@ package com.android.gallery3d.filtershow.presets; import android.os.Bundle; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/gallery3d/filtershow/state/StatePanel.java b/src/com/android/gallery3d/filtershow/state/StatePanel.java index 95c2df991..039bc2ca0 100644 --- a/src/com/android/gallery3d/filtershow/state/StatePanel.java +++ b/src/com/android/gallery3d/filtershow/state/StatePanel.java @@ -17,7 +17,7 @@ package com.android.gallery3d.filtershow.state; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java index b42c9f367..9f726b4a8 100644 --- a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java +++ b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java @@ -22,7 +22,7 @@ import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; diff --git a/src/com/android/gallery3d/ingest/IngestActivity.java b/src/com/android/gallery3d/ingest/IngestActivity.java index 46173d686..b0b3e0532 100644 --- a/src/com/android/gallery3d/ingest/IngestActivity.java +++ b/src/com/android/gallery3d/ingest/IngestActivity.java @@ -42,7 +42,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.os.Message; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.SparseBooleanArray; import android.view.ActionMode; import android.view.Menu; diff --git a/src/com/android/gallery3d/ingest/IngestService.java b/src/com/android/gallery3d/ingest/IngestService.java index 98aa7f5c6..262e41086 100644 --- a/src/com/android/gallery3d/ingest/IngestService.java +++ b/src/com/android/gallery3d/ingest/IngestService.java @@ -37,7 +37,7 @@ import android.os.Binder; import android.os.Build; import android.os.IBinder; import android.os.SystemClock; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.util.SparseBooleanArray; import android.widget.Adapter; diff --git a/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java b/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java index 9fe650c17..6c1dd9ff4 100644 --- a/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java +++ b/src/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java @@ -25,7 +25,7 @@ import com.android.gallery3d.ingest.ui.MtpFullscreenView; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.v4.view.PagerAdapter; +import androidx.viewpager.widget.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java index 1ace71829..22b3b575a 100644 --- a/src/com/android/gallery3d/ui/MenuExecutor.java +++ b/src/com/android/gallery3d/ui/MenuExecutor.java @@ -26,7 +26,7 @@ import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.support.v4.print.PrintHelper; +import androidx.print.PrintHelper; import android.view.Menu; import android.view.MenuItem; diff --git a/src/com/android/gallery3d/ui/TileImageView.java b/src/com/android/gallery3d/ui/TileImageView.java index 1103ed80a..36500a0ca 100644 --- a/src/com/android/gallery3d/ui/TileImageView.java +++ b/src/com/android/gallery3d/ui/TileImageView.java @@ -21,7 +21,7 @@ import android.graphics.Bitmap; import android.graphics.Point; import android.graphics.Rect; import android.graphics.RectF; -import android.support.v4.util.LongSparseArray; +import androidx.collection.LongSparseArray; import android.util.DisplayMetrics; import android.view.WindowManager; diff --git a/src/com/android/gallery3d/util/AccessibilityUtils.java b/src/com/android/gallery3d/util/AccessibilityUtils.java index 9df8e4ece..80244d3db 100644 --- a/src/com/android/gallery3d/util/AccessibilityUtils.java +++ b/src/com/android/gallery3d/util/AccessibilityUtils.java @@ -17,7 +17,7 @@ package com.android.gallery3d.util; import android.content.Context; -import android.support.v4.view.accessibility.AccessibilityRecordCompat; +import androidx.core.view.accessibility.AccessibilityRecordCompat; import android.view.View; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; diff --git a/src/com/android/photos/GalleryActivity.java b/src/com/android/photos/GalleryActivity.java index f3279fe07..51c78d64d 100644 --- a/src/com/android/photos/GalleryActivity.java +++ b/src/com/android/photos/GalleryActivity.java @@ -23,8 +23,8 @@ import android.app.Fragment; import android.app.FragmentTransaction; import android.content.Intent; import android.os.Bundle; -import android.support.v13.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.legacy.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.Menu; import android.view.MenuItem; import android.view.ViewGroup; diff --git a/src/com/android/photos/views/GalleryThumbnailView.java b/src/com/android/photos/views/GalleryThumbnailView.java index e5dd6f2ff..2515685dd 100644 --- a/src/com/android/photos/views/GalleryThumbnailView.java +++ b/src/com/android/photos/views/GalleryThumbnailView.java @@ -20,10 +20,10 @@ import android.content.Context; import android.content.res.TypedArray; import android.database.DataSetObserver; import android.graphics.Canvas; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.VelocityTrackerCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.widget.EdgeEffectCompat; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.VelocityTrackerCompat; +import androidx.core.view.ViewCompat; +import androidx.core.widget.EdgeEffectCompat; import android.util.AttributeSet; import android.util.Log; import android.util.SparseArray; diff --git a/src/com/android/photos/views/TiledImageRenderer.java b/src/com/android/photos/views/TiledImageRenderer.java index c4e493b34..e3b7f38f8 100644 --- a/src/com/android/photos/views/TiledImageRenderer.java +++ b/src/com/android/photos/views/TiledImageRenderer.java @@ -20,7 +20,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Rect; import android.graphics.RectF; -import android.support.v4.util.LongSparseArray; +import androidx.collection.LongSparseArray; import android.util.DisplayMetrics; import android.util.Log; import android.util.Pools.Pool; |