Android/packages_apps_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
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/vpn2/AppManagementFragment.java
View File

@@ -34,7 +34,7 @@ import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.text.TextUtils;
import android.util.Log;

4
src/com/android/settings/vpn2/AppPreference.java
View File

@@ -21,13 +21,13 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
/**
* {@link android.support.v7.preference.Preference} containing information about a VPN
* {@link androidx.preference.Preference} containing information about a VPN
* application. Tracks the package name and connection state.
*/
public class AppPreference extends ManageablePreference {

4
src/com/android/settings/vpn2/LegacyVpnPreference.java
View File

@@ -19,7 +19,7 @@ package com.android.settings.vpn2;
import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.text.TextUtils;
import android.view.View;
@@ -27,7 +27,7 @@ import com.android.internal.net.VpnProfile;
import com.android.settings.R;
/**
* {@link android.support.v7.preference.Preference} tracks the underlying legacy vpn profile and
* {@link androidx.preference.Preference} tracks the underlying legacy vpn profile and
* its connection state.
*/
public class LegacyVpnPreference extends ManageablePreference {

4
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -40,8 +40,8 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.security.Credentials;
import android.security.KeyStore;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log;