diff options
author | Aravind Sreekumar <aravinds@google.com> | 2018-04-10 12:15:45 -0700 |
---|---|---|
committer | Aravind Sreekumar <aravinds@google.com> | 2018-04-10 12:15:45 -0700 |
commit | 62e15739fa1f976a7bf31006b04bd1f19c935600 (patch) | |
tree | 5d4fac50e37bd1ad62a1313e59c3c613a4a0514e | |
parent | f8f52035b7c5c25b345ab007c2ae4c4dee707388 (diff) | |
download | android_packages_apps_SettingsIntelligence-62e15739fa1f976a7bf31006b04bd1f19c935600.tar.gz android_packages_apps_SettingsIntelligence-62e15739fa1f976a7bf31006b04bd1f19c935600.tar.bz2 android_packages_apps_SettingsIntelligence-62e15739fa1f976a7bf31006b04bd1f19c935600.zip |
Migrate SettingsIntelligence to androidx.
Test: make SettingsIntelligence
Bug: 76692459
Change-Id: Id8ec8fe6365f66493e716d45e6ba3543ef8a3898
34 files changed, 50 insertions, 50 deletions
@@ -24,13 +24,13 @@ LOCAL_SDK_VERSION := system_current LOCAL_PRIVILEGED_MODULE := true LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-v4 \ - android-support-v13 \ - android-support-v7-appcompat \ - android-support-v7-cardview \ - android-support-v7-preference \ - android-support-v7-recyclerview \ - android-support-v14-preference + androidx.legacy_legacy-support-v4 \ + androidx.legacy_legacy-support-v13 \ + androidx.appcompat_appcompat \ + androidx.cardview_cardview \ + androidx.preference_preference \ + androidx.recyclerview_recyclerview \ + androidx.legacy_legacy-preference-v14 LOCAL_USE_AAPT2 := true diff --git a/proguard.cfg b/proguard.cfg index 511e2bc..4ff3790 100644 --- a/proguard.cfg +++ b/proguard.cfg @@ -26,7 +26,7 @@ } # Keep annotated classes or class members. --keep @android.support.annotation.Keep class * +-keep @androidx.annotation.Keep class * -keepclassmembers class * { - @android.support.annotation.Keep *; + @androidx.annotation.Keep *; } diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml index b5933cc..5f621cd 100644 --- a/res/layout/search_panel.xml +++ b/res/layout/search_panel.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:background="@color/search_panel_background" android:elevation="4dp"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:id="@+id/search_bar" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -51,7 +51,7 @@ android:imeOptions="actionSearch|flagNoExtractUi" android:searchIcon="@null"/> </Toolbar> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> </FrameLayout> <FrameLayout @@ -62,7 +62,7 @@ android:orientation="vertical"> <!-- Padding is included in the background --> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/list_results" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/src/com/android/settings/intelligence/SettingsIntelligenceDumpService.java b/src/com/android/settings/intelligence/SettingsIntelligenceDumpService.java index 3ece045..af3221e 100644 --- a/src/com/android/settings/intelligence/SettingsIntelligenceDumpService.java +++ b/src/com/android/settings/intelligence/SettingsIntelligenceDumpService.java @@ -21,7 +21,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.IBinder; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.settings.intelligence.suggestions.model.SuggestionCategory; import com.android.settings.intelligence.suggestions.model.SuggestionCategoryRegistry; diff --git a/src/com/android/settings/intelligence/overlay/FeatureFactoryImpl.java b/src/com/android/settings/intelligence/overlay/FeatureFactoryImpl.java index 99798e7..20c0249 100644 --- a/src/com/android/settings/intelligence/overlay/FeatureFactoryImpl.java +++ b/src/com/android/settings/intelligence/overlay/FeatureFactoryImpl.java @@ -17,7 +17,7 @@ package com.android.settings.intelligence.overlay; import android.content.Context; -import android.support.annotation.Keep; +import androidx.annotation.Keep; import com.android.settings.intelligence.experiment.ExperimentFeatureProvider; import com.android.settings.intelligence.instrumentation.MetricsFeatureProvider; diff --git a/src/com/android/settings/intelligence/search/IntentSearchViewHolder.java b/src/com/android/settings/intelligence/search/IntentSearchViewHolder.java index ec02164..b643368 100644 --- a/src/com/android/settings/intelligence/search/IntentSearchViewHolder.java +++ b/src/com/android/settings/intelligence/search/IntentSearchViewHolder.java @@ -19,7 +19,7 @@ package com.android.settings.intelligence.search; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.View; diff --git a/src/com/android/settings/intelligence/search/ResultPayload.java b/src/com/android/settings/intelligence/search/ResultPayload.java index da5ff60..f7fd859 100644 --- a/src/com/android/settings/intelligence/search/ResultPayload.java +++ b/src/com/android/settings/intelligence/search/ResultPayload.java @@ -17,7 +17,7 @@ package com.android.settings.intelligence.search; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import android.content.Intent; import android.os.Parcel; import android.os.Parcelable; diff --git a/src/com/android/settings/intelligence/search/SearchFeatureProviderImpl.java b/src/com/android/settings/intelligence/search/SearchFeatureProviderImpl.java index 0489117..024bc61 100644 --- a/src/com/android/settings/intelligence/search/SearchFeatureProviderImpl.java +++ b/src/com/android/settings/intelligence/search/SearchFeatureProviderImpl.java @@ -18,7 +18,7 @@ package com.android.settings.intelligence.search; import android.content.Context; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.util.Pair; diff --git a/src/com/android/settings/intelligence/search/SearchFragment.java b/src/com/android/settings/intelligence/search/SearchFragment.java index 1f6a6c8..003a457 100644 --- a/src/com/android/settings/intelligence/search/SearchFragment.java +++ b/src/com/android/settings/intelligence/search/SearchFragment.java @@ -25,9 +25,9 @@ import android.app.LoaderManager; import android.content.Context; import android.content.Loader; import android.os.Bundle; -import android.support.annotation.VisibleForTesting; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.EventLog; import android.util.Log; diff --git a/src/com/android/settings/intelligence/search/SearchResultAggregator.java b/src/com/android/settings/intelligence/search/SearchResultAggregator.java index 20b156c..c5e73be 100644 --- a/src/com/android/settings/intelligence/search/SearchResultAggregator.java +++ b/src/com/android/settings/intelligence/search/SearchResultAggregator.java @@ -1,7 +1,7 @@ package com.android.settings.intelligence.search; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.ArrayMap; import android.util.Log; diff --git a/src/com/android/settings/intelligence/search/SearchResultDiffCallback.java b/src/com/android/settings/intelligence/search/SearchResultDiffCallback.java index 1d2b946..cafda9b 100644 --- a/src/com/android/settings/intelligence/search/SearchResultDiffCallback.java +++ b/src/com/android/settings/intelligence/search/SearchResultDiffCallback.java @@ -17,7 +17,7 @@ package com.android.settings.intelligence.search; -import android.support.v7.util.DiffUtil; +import androidx.recyclerview.widget.DiffUtil; import java.util.List; diff --git a/src/com/android/settings/intelligence/search/SearchResultsAdapter.java b/src/com/android/settings/intelligence/search/SearchResultsAdapter.java index decf730..41df769 100644 --- a/src/com/android/settings/intelligence/search/SearchResultsAdapter.java +++ b/src/com/android/settings/intelligence/search/SearchResultsAdapter.java @@ -18,8 +18,8 @@ package com.android.settings.intelligence.search; import android.content.Context; -import android.support.v7.util.DiffUtil; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/settings/intelligence/search/SearchViewHolder.java b/src/com/android/settings/intelligence/search/SearchViewHolder.java index c74391e..d669e6d 100644 --- a/src/com/android/settings/intelligence/search/SearchViewHolder.java +++ b/src/com/android/settings/intelligence/search/SearchViewHolder.java @@ -18,7 +18,7 @@ package com.android.settings.intelligence.search; import android.content.Context; import android.content.pm.PackageManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; diff --git a/src/com/android/settings/intelligence/search/indexing/DatabaseIndexingManager.java b/src/com/android/settings/intelligence/search/indexing/DatabaseIndexingManager.java index 0928611..d335b8c 100644 --- a/src/com/android/settings/intelligence/search/indexing/DatabaseIndexingManager.java +++ b/src/com/android/settings/intelligence/search/indexing/DatabaseIndexingManager.java @@ -46,7 +46,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; import android.os.AsyncTask; import android.provider.SearchIndexablesContract; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.util.Pair; diff --git a/src/com/android/settings/intelligence/search/indexing/IndexDataConverter.java b/src/com/android/settings/intelligence/search/indexing/IndexDataConverter.java index 167019b..f2e133a 100644 --- a/src/com/android/settings/intelligence/search/indexing/IndexDataConverter.java +++ b/src/com/android/settings/intelligence/search/indexing/IndexDataConverter.java @@ -23,8 +23,8 @@ import android.content.res.XmlResourceParser; import android.os.AsyncTask; import android.provider.SearchIndexableData; import android.provider.SearchIndexableResource; -import android.support.annotation.DrawableRes; -import android.support.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; diff --git a/src/com/android/settings/intelligence/search/indexing/IndexDatabaseHelper.java b/src/com/android/settings/intelligence/search/indexing/IndexDatabaseHelper.java index 4bec50e..51cc221 100644 --- a/src/com/android/settings/intelligence/search/indexing/IndexDatabaseHelper.java +++ b/src/com/android/settings/intelligence/search/indexing/IndexDatabaseHelper.java @@ -25,7 +25,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.os.Build; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; diff --git a/src/com/android/settings/intelligence/search/indexing/PreIndexDataCollector.java b/src/com/android/settings/intelligence/search/indexing/PreIndexDataCollector.java index fbd3209..1dbc9e1 100644 --- a/src/com/android/settings/intelligence/search/indexing/PreIndexDataCollector.java +++ b/src/com/android/settings/intelligence/search/indexing/PreIndexDataCollector.java @@ -49,7 +49,7 @@ import android.database.Cursor; import android.net.Uri; import android.provider.SearchIndexableResource; import android.provider.SearchIndexablesContract; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; diff --git a/src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java b/src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java index 6e7db64..46a8740 100644 --- a/src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java +++ b/src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java @@ -18,7 +18,7 @@ package com.android.settings.intelligence.search.indexing; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; diff --git a/src/com/android/settings/intelligence/search/query/DatabaseResultTask.java b/src/com/android/settings/intelligence/search/query/DatabaseResultTask.java index 65d190a..93bc261 100644 --- a/src/com/android/settings/intelligence/search/query/DatabaseResultTask.java +++ b/src/com/android/settings/intelligence/search/query/DatabaseResultTask.java @@ -23,7 +23,7 @@ import static com.android.settings.intelligence.search.indexing.IndexDatabaseHel import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; import android.util.Pair; diff --git a/src/com/android/settings/intelligence/search/query/InputDeviceResultTask.java b/src/com/android/settings/intelligence/search/query/InputDeviceResultTask.java index e98ea0d..4cad4cc 100644 --- a/src/com/android/settings/intelligence/search/query/InputDeviceResultTask.java +++ b/src/com/android/settings/intelligence/search/query/InputDeviceResultTask.java @@ -22,8 +22,8 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.icu.text.ListFormatter; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.InputDevice; import android.view.inputmethod.InputMethodInfo; diff --git a/src/com/android/settings/intelligence/search/query/SearchQueryTask.java b/src/com/android/settings/intelligence/search/query/SearchQueryTask.java index be0546b..4354d1d 100644 --- a/src/com/android/settings/intelligence/search/query/SearchQueryTask.java +++ b/src/com/android/settings/intelligence/search/query/SearchQueryTask.java @@ -17,7 +17,7 @@ package com.android.settings.intelligence.search.query; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.android.settings.intelligence.overlay.FeatureFactory; import com.android.settings.intelligence.search.SearchResult; diff --git a/src/com/android/settings/intelligence/search/savedqueries/SavedQueryLoader.java b/src/com/android/settings/intelligence/search/savedqueries/SavedQueryLoader.java index 9d0316c..0897efe 100644 --- a/src/com/android/settings/intelligence/search/savedqueries/SavedQueryLoader.java +++ b/src/com/android/settings/intelligence/search/savedqueries/SavedQueryLoader.java @@ -19,7 +19,7 @@ package com.android.settings.intelligence.search.savedqueries; import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.settings.intelligence.search.SearchResult; import com.android.settings.intelligence.search.indexing.IndexDatabaseHelper; diff --git a/src/com/android/settings/intelligence/search/savedqueries/SavedQueryPayload.java b/src/com/android/settings/intelligence/search/savedqueries/SavedQueryPayload.java index 264eee9..9a8a6fe 100644 --- a/src/com/android/settings/intelligence/search/savedqueries/SavedQueryPayload.java +++ b/src/com/android/settings/intelligence/search/savedqueries/SavedQueryPayload.java @@ -17,7 +17,7 @@ package com.android.settings.intelligence.search.savedqueries; import android.os.Parcel; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.settings.intelligence.search.ResultPayload; diff --git a/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java b/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java index 315cd4f..8811624 100644 --- a/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java +++ b/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java @@ -19,7 +19,7 @@ package com.android.settings.intelligence.search.sitemap; import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.support.annotation.WorkerThread; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import android.util.Log; diff --git a/src/com/android/settings/intelligence/suggestions/SuggestionParser.java b/src/com/android/settings/intelligence/suggestions/SuggestionParser.java index f7cecd2..0058d65 100644 --- a/src/com/android/settings/intelligence/suggestions/SuggestionParser.java +++ b/src/com/android/settings/intelligence/suggestions/SuggestionParser.java @@ -25,7 +25,7 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.service.settings.suggestions.Suggestion; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.ArrayMap; import android.util.Log; diff --git a/src/com/android/settings/intelligence/suggestions/eligibility/AccountEligibilityChecker.java b/src/com/android/settings/intelligence/suggestions/eligibility/AccountEligibilityChecker.java index 447dc77..2d26d4b 100644 --- a/src/com/android/settings/intelligence/suggestions/eligibility/AccountEligibilityChecker.java +++ b/src/com/android/settings/intelligence/suggestions/eligibility/AccountEligibilityChecker.java @@ -20,7 +20,7 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.content.Context; import android.content.pm.ResolveInfo; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; public class AccountEligibilityChecker { diff --git a/src/com/android/settings/intelligence/suggestions/eligibility/CandidateSuggestionFilter.java b/src/com/android/settings/intelligence/suggestions/eligibility/CandidateSuggestionFilter.java index 5f614f6..83bd914 100644 --- a/src/com/android/settings/intelligence/suggestions/eligibility/CandidateSuggestionFilter.java +++ b/src/com/android/settings/intelligence/suggestions/eligibility/CandidateSuggestionFilter.java @@ -25,8 +25,8 @@ import android.content.pm.ProviderInfo; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; diff --git a/src/com/android/settings/intelligence/suggestions/eligibility/ConnectivityEligibilityChecker.java b/src/com/android/settings/intelligence/suggestions/eligibility/ConnectivityEligibilityChecker.java index 9318c98..ec0a3ee 100644 --- a/src/com/android/settings/intelligence/suggestions/eligibility/ConnectivityEligibilityChecker.java +++ b/src/com/android/settings/intelligence/suggestions/eligibility/ConnectivityEligibilityChecker.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.pm.ResolveInfo; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; public class ConnectivityEligibilityChecker { diff --git a/src/com/android/settings/intelligence/suggestions/eligibility/DismissedChecker.java b/src/com/android/settings/intelligence/suggestions/eligibility/DismissedChecker.java index ba24baf..428d6dd 100644 --- a/src/com/android/settings/intelligence/suggestions/eligibility/DismissedChecker.java +++ b/src/com/android/settings/intelligence/suggestions/eligibility/DismissedChecker.java @@ -19,7 +19,7 @@ package com.android.settings.intelligence.suggestions.eligibility; import android.content.Context; import android.content.SharedPreferences; import android.content.pm.ResolveInfo; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.Log; diff --git a/src/com/android/settings/intelligence/suggestions/eligibility/FeatureEligibilityChecker.java b/src/com/android/settings/intelligence/suggestions/eligibility/FeatureEligibilityChecker.java index 1308515..697a867 100644 --- a/src/com/android/settings/intelligence/suggestions/eligibility/FeatureEligibilityChecker.java +++ b/src/com/android/settings/intelligence/suggestions/eligibility/FeatureEligibilityChecker.java @@ -18,7 +18,7 @@ package com.android.settings.intelligence.suggestions.eligibility; import android.content.Context; import android.content.pm.ResolveInfo; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; diff --git a/src/com/android/settings/intelligence/suggestions/model/CandidateSuggestion.java b/src/com/android/settings/intelligence/suggestions/model/CandidateSuggestion.java index c468ab9..c387e9d 100644 --- a/src/com/android/settings/intelligence/suggestions/model/CandidateSuggestion.java +++ b/src/com/android/settings/intelligence/suggestions/model/CandidateSuggestion.java @@ -27,7 +27,7 @@ import android.graphics.drawable.Icon; import android.net.Uri; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; diff --git a/src/com/android/settings/intelligence/suggestions/model/SuggestionCategoryRegistry.java b/src/com/android/settings/intelligence/suggestions/model/SuggestionCategoryRegistry.java index 84b2332..4c2cfb4 100644 --- a/src/com/android/settings/intelligence/suggestions/model/SuggestionCategoryRegistry.java +++ b/src/com/android/settings/intelligence/suggestions/model/SuggestionCategoryRegistry.java @@ -16,7 +16,7 @@ package com.android.settings.intelligence.suggestions.model; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import java.util.ArrayList; diff --git a/src/com/android/settings/intelligence/suggestions/ranking/SuggestionEventStore.java b/src/com/android/settings/intelligence/suggestions/ranking/SuggestionEventStore.java index 1f5f7c0..bf3b4ed 100644 --- a/src/com/android/settings/intelligence/suggestions/ranking/SuggestionEventStore.java +++ b/src/com/android/settings/intelligence/suggestions/ranking/SuggestionEventStore.java @@ -16,11 +16,11 @@ package com.android.settings.intelligence.suggestions.ranking; -import static android.support.annotation.VisibleForTesting.NONE; +import static androidx.annotation.VisibleForTesting.NONE; import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; import java.util.Arrays; diff --git a/src/com/android/settings/intelligence/suggestions/ranking/SuggestionRanker.java b/src/com/android/settings/intelligence/suggestions/ranking/SuggestionRanker.java index e62262e..61c08e9 100644 --- a/src/com/android/settings/intelligence/suggestions/ranking/SuggestionRanker.java +++ b/src/com/android/settings/intelligence/suggestions/ranking/SuggestionRanker.java @@ -18,7 +18,7 @@ package com.android.settings.intelligence.suggestions.ranking; import android.content.Context; import android.service.settings.suggestions.Suggestion; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.settings.intelligence.overlay.FeatureFactory; |