PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate Settings to androidx.

Browse Source 
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
This commit is contained in:
Aurimas Liutikas
2018-04-17 11:22:43 -07:00
committed by Colin Cross
parent 6e65a32468
commit b1af85d155
1189 changed files with 2368 additions and 2368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/nfc/AndroidBeamPreferenceController.java
View File

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

2
src/com/android/settings/nfc/BaseNfcEnabler.java
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

4
src/com/android/settings/nfc/NfcAirplaneModeObserver.java
View File

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

2
src/com/android/settings/nfc/NfcEnabler.java
View File

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

4
src/com/android/settings/nfc/NfcForegroundPreference.java
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;

2
src/com/android/settings/nfc/NfcPaymentPreference.java
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;

6
src/com/android/settings/nfc/NfcPreferenceController.java
View File

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

4
src/com/android/settings/nfc/PaymentSettings.java
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;