diff options
author | Aurimas Liutikas <aurimas@google.com> | 2018-04-17 11:22:43 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2018-08-28 11:48:56 -0700 |
commit | b1af85d15523db44d4fa80c78409069ec691ed0a (patch) | |
tree | 5563667ac3d7f33c83b59931d5894d2d097319ca /src/com/android/settings/nfc | |
parent | 6e65a324687c33c8a4ff9b9db2dc41e3fdc28992 (diff) | |
download | packages_apps_Settings-b1af85d15523db44d4fa80c78409069ec691ed0a.tar.gz packages_apps_Settings-b1af85d15523db44d4fa80c78409069ec691ed0a.tar.bz2 packages_apps_Settings-b1af85d15523db44d4fa80c78409069ec691ed0a.zip |
Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89)
Diffstat (limited to 'src/com/android/settings/nfc')
8 files changed, 14 insertions, 14 deletions
diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java index b4026de15a..12ab1b756d 100644 --- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java +++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java @@ -17,8 +17,8 @@ package com.android.settings.nfc; import android.content.Context; import android.nfc.NfcAdapter; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/nfc/BaseNfcEnabler.java b/src/com/android/settings/nfc/BaseNfcEnabler.java index 5c5f95ca7c..88bafb98fb 100644 --- a/src/com/android/settings/nfc/BaseNfcEnabler.java +++ b/src/com/android/settings/nfc/BaseNfcEnabler.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.nfc.NfcAdapter; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; /** * BaseNfcEnabler is a abstract helper to manage the Nfc state for Nfc and Android Beam diff --git a/src/com/android/settings/nfc/NfcAirplaneModeObserver.java b/src/com/android/settings/nfc/NfcAirplaneModeObserver.java index 723d814391..d0ce045296 100644 --- a/src/com/android/settings/nfc/NfcAirplaneModeObserver.java +++ b/src/com/android/settings/nfc/NfcAirplaneModeObserver.java @@ -22,8 +22,8 @@ import android.nfc.NfcAdapter; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; /** * NfcAirplaneModeObserver is a helper to manage the Nfc on/off when airplane mode status diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java index f39a0a1a46..b3450cbb8c 100644 --- a/src/com/android/settings/nfc/NfcEnabler.java +++ b/src/com/android/settings/nfc/NfcEnabler.java @@ -18,7 +18,7 @@ package com.android.settings.nfc; import android.content.Context; import android.nfc.NfcAdapter; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; /** * NfcEnabler is a helper to manage the Nfc on/off checkbox preference. It turns on/off Nfc diff --git a/src/com/android/settings/nfc/NfcForegroundPreference.java b/src/com/android/settings/nfc/NfcForegroundPreference.java index 89095a41a7..728f2e4b59 100644 --- a/src/com/android/settings/nfc/NfcForegroundPreference.java +++ b/src/com/android/settings/nfc/NfcForegroundPreference.java @@ -16,8 +16,8 @@ package com.android.settings.nfc; import android.content.Context; -import android.support.v7.preference.DropDownPreference; -import android.support.v7.preference.Preference; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/nfc/NfcPaymentPreference.java b/src/com/android/settings/nfc/NfcPaymentPreference.java index a3f7466200..0838a90e62 100644 --- a/src/com/android/settings/nfc/NfcPaymentPreference.java +++ b/src/com/android/settings/nfc/NfcPaymentPreference.java @@ -21,7 +21,7 @@ import android.content.Context; import android.app.Dialog; import android.content.DialogInterface; import android.content.Intent; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index a5d7c768ec..a74b987560 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -21,9 +21,9 @@ import android.nfc.NfcAdapter; import android.provider.Settings; import android.text.TextUtils; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index c832dfc8ec..27ae093484 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -21,8 +21,8 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.Bundle; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; |