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/accounts/AccountDetailDashboardFragment.java
View File

@@ -21,8 +21,8 @@ import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.PreferenceScreen;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;

4
src/com/android/settings/accounts/AccountHeaderPreferenceController.java
View File

@@ -24,8 +24,8 @@ import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
import android.support.v14.preference.PreferenceFragment;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.PreferenceFragment;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;

4
src/com/android/settings/accounts/AccountPreference.java
View File

@@ -19,8 +19,8 @@ package com.android.settings.accounts;
import android.accounts.Account;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import android.util.Log;
import android.widget.ImageView;

8
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -36,10 +36,10 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import android.text.BidiFormatter;
import android.util.ArrayMap;
import android.util.Log;

6
src/com/android/settings/accounts/AccountSyncPreferenceController.java
View File

@@ -24,9 +24,9 @@ import android.content.Context;
import android.content.SyncAdapterType;
import android.os.Bundle;
import android.os.UserHandle;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;

2
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -35,7 +35,7 @@ import android.os.Binder;
import android.os.Bundle;
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;
import android.view.LayoutInflater;

4
src/com/android/settings/accounts/AccountTypePreference.java
View File

@@ -24,8 +24,8 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;

10
src/com/android/settings/accounts/AccountTypePreferenceLoader.java
View File

@@ -29,11 +29,11 @@ import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.os.UserHandle;
import android.support.v14.preference.PreferenceFragment;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.PreferenceFragment;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;

4
src/com/android/settings/accounts/ChooseAccountActivity.java
View File

@@ -33,8 +33,8 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

2
src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
View File

@@ -22,7 +22,7 @@ import android.content.pm.UserInfo;
import android.content.res.Resources;
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.settings.core.PreferenceControllerMixin;

4
src/com/android/settings/accounts/ManagedProfileSettings.java
View File

@@ -24,8 +24,8 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;

2
src/com/android/settings/accounts/RemoveAccountPreferenceController.java
View File

@@ -31,7 +31,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.v7.preference.PreferenceScreen;
import androidx.preference.PreferenceScreen;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;

4
src/com/android/settings/accounts/SyncStateSwitchPreference.java
View File

@@ -19,8 +19,8 @@ package com.android.settings.accounts;
import android.accounts.Account;
import android.app.ActivityManager;
import android.content.Context;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreference;
import androidx.preference.PreferenceViewHolder;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;