Migrate Settings to androidx.

Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
This commit is contained in:
Aurimas Liutikas
2018-04-17 11:22:43 -07:00
parent 538a4594ff
commit e0069d332d
1161 changed files with 2316 additions and 2316 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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

View File

@@ -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;

View File

@@ -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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;