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

4
src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
View File

@@ -51,7 +51,7 @@ public class ActionDisabledByAdminDialog extends Activity
mDialogHelper.updateDialog(restriction, admin);
}
@android.support.annotation.VisibleForTesting
@androidx.annotation.VisibleForTesting
EnforcedAdmin getAdminDetailsFromIntent(Intent intent) {
final EnforcedAdmin admin = new EnforcedAdmin(null, UserHandle.myUserId());
if (intent == null) {
@@ -62,7 +62,7 @@ public class ActionDisabledByAdminDialog extends Activity
return admin;
}
@android.support.annotation.VisibleForTesting
@androidx.annotation.VisibleForTesting
String getRestrictionFromIntent(Intent intent) {
if (intent == null) return null;
return intent.getStringExtra(DevicePolicyManager.EXTRA_RESTRICTION);

2
src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
View File

@@ -26,7 +26,7 @@ import android.graphics.drawable.Drawable;
import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.util.IconDrawableFactory;
import android.view.LayoutInflater;
import android.view.View;

2
src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
View File

@@ -15,7 +15,7 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import android.text.format.DateUtils;
import com.android.settings.R;

2
src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;

2
src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
View File

@@ -14,7 +14,7 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;

4
src/com/android/settings/enterprise/ApplicationListPreferenceController.java
View File

@@ -18,8 +18,8 @@ package com.android.settings.enterprise;
import android.content.Context;
import android.content.pm.PackageManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.util.IconDrawableFactory;
import com.android.settings.SettingsPreferenceFragment;

4
src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
View File

@@ -15,8 +15,8 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;

2
src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java
View File

@@ -15,7 +15,7 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
public class CaCertsManagedProfilePreferenceController extends CaCertsPreferenceControllerBase {

2
src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
View File

@@ -15,7 +15,7 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;

2
src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
View File

@@ -14,7 +14,7 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;

2
src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
View File

@@ -14,7 +14,7 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;

8
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
View File

@@ -21,10 +21,10 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;

2
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
View File

@@ -16,7 +16,7 @@ package com.android.settings.enterprise;
import android.content.Context;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;

2
src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
View File

@@ -15,7 +15,7 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;

2
src/com/android/settings/enterprise/ImePreferenceController.java
View File

@@ -15,7 +15,7 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;

2
src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
View File

@@ -14,7 +14,7 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.support.v7.preference.Preference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;