diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2018-08-14 15:21:45 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2018-08-14 15:22:12 -0700 |
| commit | d230307a958189041a7d5616e89fb2966011b55e (patch) | |
| tree | 0e3684f094f08066de7cb68d49779a60111feded /src_ui_overrides | |
| parent | a950d40d0930abff76fd49a322715fd42cad80c9 (diff) | |
| download | android_packages_apps_Trebuchet-d230307a958189041a7d5616e89fb2966011b55e.tar.gz android_packages_apps_Trebuchet-d230307a958189041a7d5616e89fb2966011b55e.tar.bz2 android_packages_apps_Trebuchet-d230307a958189041a7d5616e89fb2966011b55e.zip | |
Migrating to android-x
Change-Id: I9a774152d13a541e8496dd84f2469bfed407f86d
Diffstat (limited to 'src_ui_overrides')
4 files changed, 10 insertions, 6 deletions
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java index 21b324f07..5a1f9caa5 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java @@ -17,9 +17,6 @@ package com.android.launcher3.uioverrides.dynamicui; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.graphics.ColorUtils; import android.util.Log; import android.util.Pair; import android.util.Range; @@ -30,6 +27,10 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.graphics.ColorUtils; + /** * Implementation of tonal color extraction **/ diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java index 5c533ff34..0fd0a3531 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java @@ -17,10 +17,11 @@ package com.android.launcher3.uioverrides.dynamicui; import android.content.Context; -import android.support.annotation.Nullable; import com.android.launcher3.Utilities; +import androidx.annotation.Nullable; + public abstract class WallpaperManagerCompat { private static final Object sInstanceLock = new Object(); diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java index 7529f17f4..788344254 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java @@ -41,7 +41,6 @@ import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.HandlerThread; import android.os.ParcelFileDescriptor; -import android.support.annotation.Nullable; import android.util.Log; import android.util.Pair; @@ -51,6 +50,8 @@ import com.android.launcher3.graphics.ColorExtractor; import java.io.IOException; import java.util.ArrayList; +import androidx.annotation.Nullable; + public class WallpaperManagerCompatVL extends WallpaperManagerCompat { private static final String TAG = "WMCompatVL"; diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java index 4509e05aa..f34497deb 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java @@ -21,11 +21,12 @@ import android.app.WallpaperManager; import android.app.WallpaperManager.OnColorsChangedListener; import android.content.Context; import android.graphics.Color; -import android.support.annotation.Nullable; import android.util.Log; import java.lang.reflect.Method; +import androidx.annotation.Nullable; + @TargetApi(27) public class WallpaperManagerCompatVOMR1 extends WallpaperManagerCompat { |