summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2018-04-17 11:22:43 -0700
committerAurimas Liutikas <aurimas@google.com>2018-04-20 12:52:29 -0700
commite0069d332d5fc306e3eb60498a0a6a9087d34e65 (patch)
tree22e69164951e50ac615da65dae5b56e5d53d7ea1 /src/com/android/settings/nfc
parent538a4594ffdc90ff71fbb87a57d62b88d2620f40 (diff)
downloadpackages_apps_Settings-e0069d332d5fc306e3eb60498a0a6a9087d34e65.tar.gz
packages_apps_Settings-e0069d332d5fc306e3eb60498a0a6a9087d34e65.tar.bz2
packages_apps_Settings-e0069d332d5fc306e3eb60498a0a6a9087d34e65.zip
Migrate Settings to androidx.
Test: make Settings Bug: 76692459 Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Diffstat (limited to 'src/com/android/settings/nfc')
-rw-r--r--src/com/android/settings/nfc/AndroidBeamEnabler.java2
-rw-r--r--src/com/android/settings/nfc/AndroidBeamPreferenceController.java2
-rw-r--r--src/com/android/settings/nfc/BaseNfcEnabler.java2
-rw-r--r--src/com/android/settings/nfc/BaseNfcPreferenceController.java4
-rw-r--r--src/com/android/settings/nfc/NfcEnabler.java4
-rw-r--r--src/com/android/settings/nfc/NfcForegroundPreference.java4
-rw-r--r--src/com/android/settings/nfc/NfcPaymentPreference.java2
-rw-r--r--src/com/android/settings/nfc/NfcPreferenceController.java4
-rw-r--r--src/com/android/settings/nfc/PaymentSettings.java4
9 files changed, 14 insertions, 14 deletions
diff --git a/src/com/android/settings/nfc/AndroidBeamEnabler.java b/src/com/android/settings/nfc/AndroidBeamEnabler.java
index 66e42b6418..5041a3e731 100644
--- a/src/com/android/settings/nfc/AndroidBeamEnabler.java
+++ b/src/com/android/settings/nfc/AndroidBeamEnabler.java
@@ -20,7 +20,7 @@ import android.content.Context;
import android.nfc.NfcAdapter;
import android.os.UserHandle;
import android.os.UserManager;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
index 6ae7fe5ccf..739f00e457 100644
--- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
+++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.nfc;
import android.content.Context;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
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/BaseNfcPreferenceController.java b/src/com/android/settings/nfc/BaseNfcPreferenceController.java
index b945738eab..7956dce6e3 100644
--- a/src/com/android/settings/nfc/BaseNfcPreferenceController.java
+++ b/src/com/android/settings/nfc/BaseNfcPreferenceController.java
@@ -22,8 +22,8 @@ import android.nfc.NfcAdapter;
import android.nfc.NfcManager;
import android.os.Handler;
import android.provider.Settings;
-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.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 29cef99355..82011a074a 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -18,8 +18,8 @@ package com.android.settings.nfc;
import android.content.Context;
import android.nfc.NfcAdapter;
-import android.support.v7.preference.Preference;
-import android.support.v14.preference.SwitchPreference;
+import androidx.preference.Preference;
+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 a0678e0afa..a00aa3241f 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -16,8 +16,8 @@
package com.android.settings.nfc;
import android.content.Context;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v14.preference.SwitchPreference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
import com.android.settings.core.PreferenceControllerMixin;
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 9532dac840..e3cf697fd2 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;